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/t3505-cherry-pick-empty.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/t3505-cherry-pick-empty.sh')
-rwxr-xr-x | third_party/git/t/t3505-cherry-pick-empty.sh | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/third_party/git/t/t3505-cherry-pick-empty.sh b/third_party/git/t/t3505-cherry-pick-empty.sh deleted file mode 100755 index 5f911bb5290f..000000000000 --- a/third_party/git/t/t3505-cherry-pick-empty.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -test_description='test cherry-picking an empty commit' - -. ./test-lib.sh - -test_expect_success setup ' - - echo first > file1 && - git add file1 && - test_tick && - git commit -m "first" && - - git checkout -b empty-message-branch && - echo third >> file1 && - git add file1 && - test_tick && - git commit --allow-empty-message -m "" && - - git checkout master && - git checkout -b empty-change-branch && - test_tick && - git commit --allow-empty -m "empty" - -' - -test_expect_success 'cherry-pick an empty commit' ' - git checkout master && - test_expect_code 1 git cherry-pick empty-change-branch -' - -test_expect_success 'index lockfile was removed' ' - test ! -f .git/index.lock -' - -test_expect_success 'cherry-pick a commit with an empty message' ' - test_when_finished "git reset --hard empty-message-branch~1" && - git checkout master && - git cherry-pick empty-message-branch -' - -test_expect_success 'index lockfile was removed' ' - test ! -f .git/index.lock -' - -test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' ' - git checkout -f master && - git cherry-pick --allow-empty-message empty-message-branch -' - -test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' ' - git checkout master && - echo fourth >>file2 && - git add file2 && - git commit -m "fourth" && - test_must_fail git cherry-pick empty-change-branch -' - -test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' ' - git checkout master && - git cherry-pick --allow-empty empty-change-branch -' - -test_expect_success 'cherry pick with --keep-redundant-commits' ' - git checkout master && - git cherry-pick --keep-redundant-commits HEAD^ -' - -test_expect_success 'cherry-pick a commit that becomes no-op (prep)' ' - git checkout master && - git branch fork && - echo foo >file2 && - git add file2 && - test_tick && - git commit -m "add file2 on master" && - - git checkout fork && - echo foo >file2 && - git add file2 && - test_tick && - git commit -m "add file2 on the side" -' - -test_expect_success 'cherry-pick a no-op without --keep-redundant' ' - git reset --hard && - git checkout fork^0 && - test_must_fail git cherry-pick master -' - -test_expect_success 'cherry-pick a no-op with --keep-redundant' ' - git reset --hard && - git checkout fork^0 && - git cherry-pick --keep-redundant-commits master && - git show -s --format=%s >actual && - echo "add file2 on master" >expect && - test_cmp expect actual -' - -test_done |