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/t4127-apply-same-fn.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/t4127-apply-same-fn.sh')
-rwxr-xr-x | third_party/git/t/t4127-apply-same-fn.sh | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/third_party/git/t/t4127-apply-same-fn.sh b/third_party/git/t/t4127-apply-same-fn.sh deleted file mode 100755 index 972946c174c1..000000000000 --- a/third_party/git/t/t4127-apply-same-fn.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -test_description='apply same filename' - -. ./test-lib.sh - -modify () { - sed -e "$1" < "$2" > "$2".x && - mv "$2".x "$2" -} - -test_expect_success setup ' - for i in a b c d e f g h i j k l m - do - echo $i - done >same_fn && - cp same_fn other_fn && - git add same_fn other_fn && - git commit -m initial -' -test_expect_success 'apply same filename with independent changes' ' - modify "s/^d/z/" same_fn && - git diff > patch0 && - git add same_fn && - modify "s/^i/y/" same_fn && - git diff >> patch0 && - cp same_fn same_fn2 && - git reset --hard && - git apply patch0 && - test_cmp same_fn same_fn2 -' - -test_expect_success 'apply same filename with overlapping changes' ' - git reset --hard && - modify "s/^d/z/" same_fn && - git diff > patch0 && - git add same_fn && - modify "s/^e/y/" same_fn && - git diff >> patch0 && - cp same_fn same_fn2 && - git reset --hard && - git apply patch0 && - test_cmp same_fn same_fn2 -' - -test_expect_success 'apply same new filename after rename' ' - git reset --hard && - git mv same_fn new_fn && - modify "s/^d/z/" new_fn && - git add new_fn && - git diff -M --cached > patch1 && - modify "s/^e/y/" new_fn && - git diff >> patch1 && - cp new_fn new_fn2 && - git reset --hard && - git apply --index patch1 && - test_cmp new_fn new_fn2 -' - -test_expect_success 'apply same old filename after rename -- should fail.' ' - git reset --hard && - git mv same_fn new_fn && - modify "s/^d/z/" new_fn && - git add new_fn && - git diff -M --cached > patch1 && - git mv new_fn same_fn && - modify "s/^e/y/" same_fn && - git diff >> patch1 && - git reset --hard && - test_must_fail git apply patch1 -' - -test_expect_success 'apply A->B (rename), C->A (rename), A->A -- should pass.' ' - git reset --hard && - git mv same_fn new_fn && - modify "s/^d/z/" new_fn && - git add new_fn && - git diff -M --cached > patch1 && - git commit -m "a rename" && - git mv other_fn same_fn && - modify "s/^e/y/" same_fn && - git add same_fn && - git diff -M --cached >> patch1 && - modify "s/^g/x/" same_fn && - git diff >> patch1 && - git reset --hard HEAD^ && - git apply patch1 -' - -test_done |