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/t4252-am-options.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/t4252-am-options.sh')
-rwxr-xr-x | third_party/git/t/t4252-am-options.sh | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/third_party/git/t/t4252-am-options.sh b/third_party/git/t/t4252-am-options.sh deleted file mode 100755 index e758e634a347..000000000000 --- a/third_party/git/t/t4252-am-options.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -test_description='git am with options and not losing them' -. ./test-lib.sh - -tm="$TEST_DIRECTORY/t4252" - -test_expect_success setup ' - cp "$tm/file-1-0" file-1 && - cp "$tm/file-2-0" file-2 && - git add file-1 file-2 && - test_tick && - git commit -m initial && - git tag initial -' - -test_expect_success 'interrupted am --whitespace=fix' ' - rm -rf .git/rebase-apply && - git reset --hard initial && - test_must_fail git am --whitespace=fix "$tm"/am-test-1-? && - git am --skip && - grep 3 file-1 && - grep "^Six$" file-2 -' - -test_expect_success 'interrupted am -C1' ' - rm -rf .git/rebase-apply && - git reset --hard initial && - test_must_fail git am -C1 "$tm"/am-test-2-? && - git am --skip && - grep 3 file-1 && - grep "^Three$" file-2 -' - -test_expect_success 'interrupted am -p2' ' - rm -rf .git/rebase-apply && - git reset --hard initial && - test_must_fail git am -p2 "$tm"/am-test-3-? && - git am --skip && - grep 3 file-1 && - grep "^Three$" file-2 -' - -test_expect_success 'interrupted am -C1 -p2' ' - rm -rf .git/rebase-apply && - git reset --hard initial && - test_must_fail git am -p2 -C1 "$tm"/am-test-4-? && - git am --skip && - grep 3 file-1 && - grep "^Three$" file-2 -' - -test_expect_success 'interrupted am --directory="frotz nitfol"' ' - rm -rf .git/rebase-apply && - git reset --hard initial && - test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? && - git am --skip && - grep One "frotz nitfol/file-5" -' - -test_expect_success 'apply to a funny path' ' - with_sq="with'\''sq" && - rm -fr .git/rebase-apply && - git reset --hard initial && - git am --directory="$with_sq" "$tm"/am-test-5-2 && - test -f "$with_sq/file-5" -' - -test_expect_success 'am --reject' ' - rm -rf .git/rebase-apply && - git reset --hard initial && - test_must_fail git am --reject "$tm"/am-test-6-1 && - grep "@@ -1,3 +1,3 @@" file-2.rej && - test_must_fail git diff-files --exit-code --quiet file-2 && - grep "[-]-reject" .git/rebase-apply/apply-opt -' - -test_done |