diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t3416-rebase-onto-threedots.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t3416-rebase-onto-threedots.sh')
-rwxr-xr-x | third_party/git/t/t3416-rebase-onto-threedots.sh | 162 |
1 files changed, 0 insertions, 162 deletions
diff --git a/third_party/git/t/t3416-rebase-onto-threedots.sh b/third_party/git/t/t3416-rebase-onto-threedots.sh deleted file mode 100755 index 9c2548423bce..000000000000 --- a/third_party/git/t/t3416-rebase-onto-threedots.sh +++ /dev/null @@ -1,162 +0,0 @@ -#!/bin/sh - -test_description='git rebase --onto A...B' - -. ./test-lib.sh -. "$TEST_DIRECTORY/lib-rebase.sh" - -# Rebase only the tip commit of "topic" on merge base between "master" -# and "topic". Cannot do this for "side" with "master" because there -# is no single merge base. -# -# -# F---G topic G' -# / / -# A---B---C---D---E master --> A---B---C---D---E -# \ \ / -# \ x -# \ / \ -# H---I---J---K side - -test_expect_success setup ' - test_commit A && - test_commit B && - git branch side && - test_commit C && - git branch topic && - git checkout side && - test_commit H && - git checkout master && - test_tick && - git merge H && - git tag D && - test_commit E && - git checkout topic && - test_commit F && - test_commit G && - git checkout side && - test_tick && - git merge C && - git tag I && - test_commit J && - test_commit K -' - -test_expect_success 'rebase --onto master...topic' ' - git reset --hard && - git checkout topic && - git reset --hard G && - - git rebase --onto master...topic F && - git rev-parse HEAD^1 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase --onto master...' ' - git reset --hard && - git checkout topic && - git reset --hard G && - - git rebase --onto master... F && - git rev-parse HEAD^1 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase --onto master...side' ' - git reset --hard && - git checkout side && - git reset --hard K && - - test_must_fail git rebase --onto master...side J -' - -test_expect_success 'rebase -i --onto master...topic' ' - git reset --hard && - git checkout topic && - git reset --hard G && - set_fake_editor && - EXPECT_COUNT=1 git rebase -i --onto master...topic F && - git rev-parse HEAD^1 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase -i --onto master...' ' - git reset --hard && - git checkout topic && - git reset --hard G && - set_fake_editor && - EXPECT_COUNT=1 git rebase -i --onto master... F && - git rev-parse HEAD^1 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase -i --onto master...side' ' - git reset --hard && - git checkout side && - git reset --hard K && - - set_fake_editor && - test_must_fail git rebase -i --onto master...side J -' - -test_expect_success 'rebase --keep-base --onto incompatible' ' - test_must_fail git rebase --keep-base --onto master... -' - -test_expect_success 'rebase --keep-base --root incompatible' ' - test_must_fail git rebase --keep-base --root -' - -test_expect_success 'rebase --keep-base master from topic' ' - git reset --hard && - git checkout topic && - git reset --hard G && - - git rebase --keep-base master && - git rev-parse C >base.expect && - git merge-base master HEAD >base.actual && - test_cmp base.expect base.actual && - - git rev-parse HEAD~2 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase --keep-base master from side' ' - git reset --hard && - git checkout side && - git reset --hard K && - - test_must_fail git rebase --keep-base master -' - -test_expect_success 'rebase -i --keep-base master from topic' ' - git reset --hard && - git checkout topic && - git reset --hard G && - - set_fake_editor && - EXPECT_COUNT=2 git rebase -i --keep-base master && - git rev-parse C >base.expect && - git merge-base master HEAD >base.actual && - test_cmp base.expect base.actual && - - git rev-parse HEAD~2 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase -i --keep-base master from side' ' - git reset --hard && - git checkout side && - git reset --hard K && - - set_fake_editor && - test_must_fail git rebase -i --keep-base master -' - -test_done |