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/t4000-diff-format.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/t4000-diff-format.sh')
| -rwxr-xr-x | third_party/git/t/t4000-diff-format.sh | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/third_party/git/t/t4000-diff-format.sh b/third_party/git/t/t4000-diff-format.sh deleted file mode 100755 index e5116a76a1..0000000000 --- a/third_party/git/t/t4000-diff-format.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='Test built-in diff output engine. - -' -. ./test-lib.sh -. "$TEST_DIRECTORY"/diff-lib.sh - -echo >path0 'Line 1 -Line 2 -line 3' -cat path0 >path1 -chmod +x path1 - -test_expect_success 'update-index --add two files with and without +x.' ' - git update-index --add path0 path1 -' - -mv path0 path0- -sed -e 's/line/Line/' <path0- >path0 -chmod +x path0 -rm -f path1 -test_expect_success 'git diff-files -p after editing work tree.' ' - git diff-files -p >actual -' - -# that's as far as it comes -if [ "$(git config --get core.filemode)" = false ] -then - say 'filemode disabled on the filesystem' - test_done -fi - -cat >expected <<\EOF -diff --git a/path0 b/path0 -old mode 100644 -new mode 100755 ---- a/path0 -+++ b/path0 -@@ -1,3 +1,3 @@ - Line 1 - Line 2 --line 3 -+Line 3 -diff --git a/path1 b/path1 -deleted file mode 100755 ---- a/path1 -+++ /dev/null -@@ -1,3 +0,0 @@ --Line 1 --Line 2 --line 3 -EOF - -test_expect_success 'validate git diff-files -p output.' ' - compare_diff_patch expected actual -' - -test_expect_success 'git diff-files -s after editing work tree' ' - git diff-files -s >actual 2>err && - test_must_be_empty actual && - test_must_be_empty err -' - -test_expect_success 'git diff-files --no-patch as synonym for -s' ' - git diff-files --no-patch >actual 2>err && - test_must_be_empty actual && - test_must_be_empty err -' - -test_expect_success 'git diff-files --no-patch --patch shows the patch' ' - git diff-files --no-patch --patch >actual && - compare_diff_patch expected actual -' - -test_expect_success 'git diff-files --no-patch --patch-with-raw shows the patch and raw data' ' - git diff-files --no-patch --patch-with-raw >actual && - grep -q "^:100644 100755 .* $ZERO_OID M path0\$" actual && - tail -n +4 actual >actual-patch && - compare_diff_patch expected actual-patch -' - -test_expect_success 'git diff-files --patch --no-patch does not show the patch' ' - git diff-files --patch --no-patch >actual 2>err && - test_must_be_empty actual && - test_must_be_empty err -' - -test_done |