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/t4129-apply-samemode.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/t4129-apply-samemode.sh')
-rwxr-xr-x | third_party/git/t/t4129-apply-samemode.sh | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/third_party/git/t/t4129-apply-samemode.sh b/third_party/git/t/t4129-apply-samemode.sh deleted file mode 100755 index 5cdd76dfa726..000000000000 --- a/third_party/git/t/t4129-apply-samemode.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -test_description='applying patch with mode bits' - -. ./test-lib.sh - -test_expect_success setup ' - echo original >file && - git add file && - test_tick && - git commit -m initial && - git tag initial && - echo modified >file && - git diff --stat -p >patch-0.txt && - chmod +x file && - git diff --stat -p >patch-1.txt && - sed "s/^\(new mode \).*/\1/" <patch-1.txt >patch-empty-mode.txt && - sed "s/^\(new mode \).*/\1garbage/" <patch-1.txt >patch-bogus-mode.txt -' - -test_expect_success FILEMODE 'same mode (no index)' ' - git reset --hard && - chmod +x file && - git apply patch-0.txt && - test -x file -' - -test_expect_success FILEMODE 'same mode (with index)' ' - git reset --hard && - chmod +x file && - git add file && - git apply --index patch-0.txt && - test -x file && - git diff --exit-code -' - -test_expect_success FILEMODE 'same mode (index only)' ' - git reset --hard && - chmod +x file && - git add file && - git apply --cached patch-0.txt && - git ls-files -s file | grep "^100755" -' - -test_expect_success FILEMODE 'mode update (no index)' ' - git reset --hard && - git apply patch-1.txt && - test -x file -' - -test_expect_success FILEMODE 'mode update (with index)' ' - git reset --hard && - git apply --index patch-1.txt && - test -x file && - git diff --exit-code -' - -test_expect_success FILEMODE 'mode update (index only)' ' - git reset --hard && - git apply --cached patch-1.txt && - git ls-files -s file | grep "^100755" -' - -test_expect_success FILEMODE 'empty mode is rejected' ' - git reset --hard && - test_must_fail git apply patch-empty-mode.txt 2>err && - test_i18ngrep "invalid mode" err -' - -test_expect_success FILEMODE 'bogus mode is rejected' ' - git reset --hard && - test_must_fail git apply patch-bogus-mode.txt 2>err && - test_i18ngrep "invalid mode" err -' - -test_done |