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/t3502-cherry-pick-merge.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/t3502-cherry-pick-merge.sh')
-rwxr-xr-x | third_party/git/t/t3502-cherry-pick-merge.sh | 132 |
1 files changed, 0 insertions, 132 deletions
diff --git a/third_party/git/t/t3502-cherry-pick-merge.sh b/third_party/git/t/t3502-cherry-pick-merge.sh deleted file mode 100755 index 8b635a196d5c..000000000000 --- a/third_party/git/t/t3502-cherry-pick-merge.sh +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh - -test_description='cherry picking and reverting a merge - - b---c - / / - initial---a - -' - -. ./test-lib.sh - -test_expect_success setup ' - - >A && - >B && - git add A B && - git commit -m "Initial" && - git tag initial && - git branch side && - echo new line >A && - git commit -m "add line to A" A && - git tag a && - git checkout side && - echo new line >B && - git commit -m "add line to B" B && - git tag b && - git checkout master && - git merge side && - git tag c - -' - -test_expect_success 'cherry-pick -m complains of bogus numbers' ' - # expect 129 here to distinguish between cases where - # there was nothing to cherry-pick - test_expect_code 129 git cherry-pick -m && - test_expect_code 129 git cherry-pick -m foo b && - test_expect_code 129 git cherry-pick -m -1 b && - test_expect_code 129 git cherry-pick -m 0 b -' - -test_expect_success 'cherry-pick explicit first parent of a non-merge' ' - - git reset --hard && - git checkout a^0 && - git cherry-pick -m 1 b && - git diff --exit-code c -- - -' - -test_expect_success 'cherry pick a merge without -m should fail' ' - - git reset --hard && - git checkout a^0 && - test_must_fail git cherry-pick c && - git diff --exit-code a -- - -' - -test_expect_success 'cherry pick a merge (1)' ' - - git reset --hard && - git checkout a^0 && - git cherry-pick -m 1 c && - git diff --exit-code c - -' - -test_expect_success 'cherry pick a merge (2)' ' - - git reset --hard && - git checkout b^0 && - git cherry-pick -m 2 c && - git diff --exit-code c - -' - -test_expect_success 'cherry pick a merge relative to nonexistent parent should fail' ' - - git reset --hard && - git checkout b^0 && - test_must_fail git cherry-pick -m 3 c - -' - -test_expect_success 'revert explicit first parent of a non-merge' ' - - git reset --hard && - git checkout c^0 && - git revert -m 1 b && - git diff --exit-code a -- - -' - -test_expect_success 'revert a merge without -m should fail' ' - - git reset --hard && - git checkout c^0 && - test_must_fail git revert c && - git diff --exit-code c - -' - -test_expect_success 'revert a merge (1)' ' - - git reset --hard && - git checkout c^0 && - git revert -m 1 c && - git diff --exit-code a -- - -' - -test_expect_success 'revert a merge (2)' ' - - git reset --hard && - git checkout c^0 && - git revert -m 2 c && - git diff --exit-code b -- - -' - -test_expect_success 'revert a merge relative to nonexistent parent should fail' ' - - git reset --hard && - git checkout c^0 && - test_must_fail git revert -m 3 c && - git diff --exit-code c - -' - -test_done |