about summary refs log tree commit diff
path: root/third_party/git/t/t4053-diff-no-index.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/t4053-diff-no-index.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/t4053-diff-no-index.sh')
-rwxr-xr-xthird_party/git/t/t4053-diff-no-index.sh147
1 files changed, 0 insertions, 147 deletions
diff --git a/third_party/git/t/t4053-diff-no-index.sh b/third_party/git/t/t4053-diff-no-index.sh
deleted file mode 100755
index 0168946b6394..000000000000
--- a/third_party/git/t/t4053-diff-no-index.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-
-test_description='diff --no-index'
-
-. ./test-lib.sh
-
-test_expect_success 'setup' '
-	mkdir a &&
-	mkdir b &&
-	echo 1 >a/1 &&
-	echo 2 >a/2 &&
-	git init repo &&
-	echo 1 >repo/a &&
-	mkdir -p non/git &&
-	echo 1 >non/git/a &&
-	echo 1 >non/git/b
-'
-
-test_expect_success 'git diff --no-index directories' '
-	test_expect_code 1 git diff --no-index a b >cnt &&
-	test_line_count = 14 cnt
-'
-
-test_expect_success 'git diff --no-index relative path outside repo' '
-	(
-		cd repo &&
-		test_expect_code 0 git diff --no-index a ../non/git/a &&
-		test_expect_code 0 git diff --no-index ../non/git/a ../non/git/b
-	)
-'
-
-test_expect_success 'git diff --no-index with broken index' '
-	(
-		cd repo &&
-		echo broken >.git/index &&
-		git diff --no-index a ../non/git/a
-	)
-'
-
-test_expect_success 'git diff outside repo with broken index' '
-	(
-		cd repo &&
-		git diff ../non/git/a ../non/git/b
-	)
-'
-
-test_expect_success 'git diff --no-index executed outside repo gives correct error message' '
-	(
-		GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd non/git &&
-		test_must_fail git diff --no-index a 2>actual.err &&
-		test_i18ngrep "usage: git diff --no-index" actual.err
-	)
-'
-
-test_expect_success 'diff D F and diff F D' '
-	(
-		cd repo &&
-		echo in-repo >a &&
-		echo non-repo >../non/git/a &&
-		mkdir sub &&
-		echo sub-repo >sub/a &&
-
-		test_must_fail git diff --no-index sub/a ../non/git/a >expect &&
-		test_must_fail git diff --no-index sub/a ../non/git/ >actual &&
-		test_cmp expect actual &&
-
-		test_must_fail git diff --no-index a ../non/git/a >expect &&
-		test_must_fail git diff --no-index a ../non/git/ >actual &&
-		test_cmp expect actual &&
-
-		test_must_fail git diff --no-index ../non/git/a a >expect &&
-		test_must_fail git diff --no-index ../non/git a >actual &&
-		test_cmp expect actual
-	)
-'
-
-test_expect_success 'turning a file into a directory' '
-	(
-		cd non/git &&
-		mkdir d e e/sub &&
-		echo 1 >d/sub &&
-		echo 2 >e/sub/file &&
-		printf "D\td/sub\nA\te/sub/file\n" >expect &&
-		test_must_fail git diff --no-index --name-status d e >actual &&
-		test_cmp expect actual
-	)
-'
-
-test_expect_success 'diff from repo subdir shows real paths (explicit)' '
-	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff --no-index ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-'
-
-test_expect_success 'diff from repo subdir shows real paths (implicit)' '
-	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-'
-
-test_expect_success 'diff --no-index from repo subdir respects config (explicit)' '
-	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
-	test_config -C repo diff.noprefix true &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff --no-index ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-'
-
-test_expect_success 'diff --no-index from repo subdir respects config (implicit)' '
-	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
-	test_config -C repo diff.noprefix true &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-'
-
-test_expect_success 'diff --no-index from repo subdir with absolute paths' '
-	cat <<-EOF >expect &&
-	1	1	$(pwd)/non/git/{a => b}
-	EOF
-	test_expect_code 1 \
-		git -C repo/sub diff --numstat \
-		"$(pwd)/non/git/a" "$(pwd)/non/git/b" >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'diff --no-index allows external diff' '
-	test_expect_code 1 \
-		env GIT_EXTERNAL_DIFF="echo external ;:" \
-		git diff --no-index non/git/a non/git/b >actual &&
-	echo external >expect &&
-	test_cmp expect actual
-'
-
-test_done