about summary refs log tree commit diff
path: root/third_party/git/t/t4029-diff-trailing-space.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t4029-diff-trailing-space.sh
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (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/t4029-diff-trailing-space.sh')
-rwxr-xr-xthird_party/git/t/t4029-diff-trailing-space.sh43
1 files changed, 0 insertions, 43 deletions
diff --git a/third_party/git/t/t4029-diff-trailing-space.sh b/third_party/git/t/t4029-diff-trailing-space.sh
deleted file mode 100755
index 32b6e9a4e762..000000000000
--- a/third_party/git/t/t4029-diff-trailing-space.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) Jim Meyering
-#
-test_description='diff honors config option, diff.suppressBlankEmpty'
-
-. ./test-lib.sh
-
-cat <<\EOF >expected ||
-diff --git a/f b/f
-index 5f6a263..8cb8bae 100644
---- a/f
-+++ b/f
-@@ -1,2 +1,2 @@
-
--x
-+y
-EOF
-exit 1
-
-test_expect_success "$test_description" '
-	printf "\nx\n" > f &&
-	before=$(git hash-object f) &&
-	before=$(git rev-parse --short $before) &&
-	git add f &&
-	git commit -q -m. f &&
-	printf "\ny\n" > f &&
-	after=$(git hash-object f) &&
-	after=$(git rev-parse --short $after) &&
-	sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
-	git config --bool diff.suppressBlankEmpty true &&
-	git diff f > actual &&
-	test_cmp exp actual &&
-	perl -i.bak -p -e "s/^\$/ /" exp &&
-	git config --bool diff.suppressBlankEmpty false &&
-	git diff f > actual &&
-	test_cmp exp actual &&
-	git config --bool --unset diff.suppressBlankEmpty &&
-	git diff f > actual &&
-	test_cmp exp actual
-'
-
-test_done