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/t4104-apply-boundary.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/t4104-apply-boundary.sh')
-rwxr-xr-x | third_party/git/t/t4104-apply-boundary.sh | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/third_party/git/t/t4104-apply-boundary.sh b/third_party/git/t/t4104-apply-boundary.sh deleted file mode 100755 index 71ef4132d153..000000000000 --- a/third_party/git/t/t4104-apply-boundary.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='git apply boundary tests' - -. ./test-lib.sh - -L="c d e f g h i j k l m n o p q r s t u v w x" - -test_expect_success setup ' - test_write_lines b $L y >victim && - cat victim >original && - git update-index --add victim && - - # add to the head - test_write_lines a b $L y >victim && - cat victim >add-a-expect && - git diff victim >add-a-patch.with && - git diff --unified=0 >add-a-patch.without && - - # insert at line two - test_write_lines b a $L y >victim && - cat victim >insert-a-expect && - git diff victim >insert-a-patch.with && - git diff --unified=0 >insert-a-patch.without && - - # modify at the head - test_write_lines a $L y >victim && - cat victim >mod-a-expect && - git diff victim >mod-a-patch.with && - git diff --unified=0 >mod-a-patch.without && - - # remove from the head - test_write_lines $L y >victim && - cat victim >del-a-expect && - git diff victim >del-a-patch.with && - git diff --unified=0 >del-a-patch.without && - - # add to the tail - test_write_lines b $L y z >victim && - cat victim >add-z-expect && - git diff victim >add-z-patch.with && - git diff --unified=0 >add-z-patch.without && - - # modify at the tail - test_write_lines b $L z >victim && - cat victim >mod-z-expect && - git diff victim >mod-z-patch.with && - git diff --unified=0 >mod-z-patch.without && - - # remove from the tail - test_write_lines b $L >victim && - cat victim >del-z-expect && - git diff victim >del-z-patch.with && - git diff --unified=0 >del-z-patch.without - - # done -' - -for with in with without -do - case "$with" in - with) u= ;; - without) u=--unidiff-zero ;; - esac - for kind in add-a add-z insert-a mod-a mod-z del-a del-z - do - test_expect_success "apply $kind-patch $with context" ' - cat original >victim && - git update-index victim && - git apply --index $u "$kind-patch.$with" && - test_cmp "$kind-expect" victim - ' - done -done - -for kind in add-a add-z insert-a mod-a mod-z del-a del-z -do - rm -f $kind-ng.without - sed -e "s/^diff --git /diff /" \ - -e '/^index /d' \ - <$kind-patch.without >$kind-ng.without - test_expect_success "apply non-git $kind-patch without context" ' - cat original >victim && - git update-index victim && - git apply --unidiff-zero --index "$kind-ng.without" && - test_cmp "$kind-expect" victim - ' -done - -test_expect_success 'two lines' ' - >file && - git add file && - echo aaa >file && - git diff >patch && - git add file && - echo bbb >file && - git add file && - test_must_fail git apply --check patch -' - -test_expect_success 'apply patch with 3 context lines matching at end' ' - test_write_lines a b c d >file && - git add file && - echo e >>file && - git diff >patch && - >file && - test_must_fail git apply patch -' - -test_done |