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/t4118-apply-empty-context.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/t4118-apply-empty-context.sh')
-rwxr-xr-x | third_party/git/t/t4118-apply-empty-context.sh | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/third_party/git/t/t4118-apply-empty-context.sh b/third_party/git/t/t4118-apply-empty-context.sh deleted file mode 100755 index 65f2e4c3efb9..000000000000 --- a/third_party/git/t/t4118-apply-empty-context.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006 Junio C Hamano -# - -test_description='git apply with new style GNU diff with empty context - -' - -. ./test-lib.sh - -test_expect_success setup ' - { - echo; echo; - echo A; echo B; echo C; - echo; - } >file1 && - cat file1 >file1.orig && - { - cat file1 && - echo Q | tr -d "\\012" - } >file2 && - cat file2 >file2.orig && - git add file1 file2 && - sed -e "/^B/d" <file1.orig >file1 && - cat file1 > file2 && - echo Q | tr -d "\\012" >>file2 && - cat file1 >file1.mods && - cat file2 >file2.mods && - git diff | - sed -e "s/^ \$//" >diff.output -' - -test_expect_success 'apply --numstat' ' - - git apply --numstat diff.output >actual && - { - echo "0 1 file1" && - echo "0 1 file2" - } >expect && - test_cmp expect actual - -' - -test_expect_success 'apply --apply' ' - - cat file1.orig >file1 && - cat file2.orig >file2 && - git update-index file1 file2 && - git apply --index diff.output && - test_cmp file1.mods file1 && - test_cmp file2.mods file2 -' - -test_done |