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/t3503-cherry-pick-root.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/t3503-cherry-pick-root.sh')
-rwxr-xr-x | third_party/git/t/t3503-cherry-pick-root.sh | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/third_party/git/t/t3503-cherry-pick-root.sh b/third_party/git/t/t3503-cherry-pick-root.sh deleted file mode 100755 index e27f39d1e5b0..000000000000 --- a/third_party/git/t/t3503-cherry-pick-root.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -test_description='test cherry-picking (and reverting) a root commit' - -. ./test-lib.sh - -test_expect_success setup ' - - echo first > file1 && - git add file1 && - test_tick && - git commit -m "first" && - - git symbolic-ref HEAD refs/heads/second && - rm .git/index file1 && - echo second > file2 && - git add file2 && - test_tick && - git commit -m "second" && - - git symbolic-ref HEAD refs/heads/third && - rm .git/index file2 && - echo third > file3 && - git add file3 && - test_tick && - git commit -m "third" - -' - -test_expect_success 'cherry-pick a root commit' ' - - git checkout second^0 && - git cherry-pick master && - echo first >expect && - test_cmp expect file1 - -' - -test_expect_success 'revert a root commit' ' - - git revert master && - test_path_is_missing file1 - -' - -test_expect_success 'cherry-pick a root commit with an external strategy' ' - - git cherry-pick --strategy=resolve master && - echo first >expect && - test_cmp expect file1 - -' - -test_expect_success 'revert a root commit with an external strategy' ' - - git revert --strategy=resolve master && - test_path_is_missing file1 - -' - -test_expect_success 'cherry-pick two root commits' ' - - echo first >expect.file1 && - echo second >expect.file2 && - echo third >expect.file3 && - - git checkout second^0 && - git cherry-pick master third && - - test_cmp expect.file1 file1 && - test_cmp expect.file2 file2 && - test_cmp expect.file3 file3 && - git rev-parse --verify HEAD^^ && - test_must_fail git rev-parse --verify HEAD^^^ - -' - -test_done |