about summary refs log tree commit diff
path: root/third_party/git/t/t1020-subdirectory.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/t1020-subdirectory.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/t1020-subdirectory.sh')
-rwxr-xr-xthird_party/git/t/t1020-subdirectory.sh195
1 files changed, 0 insertions, 195 deletions
diff --git a/third_party/git/t/t1020-subdirectory.sh b/third_party/git/t/t1020-subdirectory.sh
deleted file mode 100755
index c2df75e495..0000000000
--- a/third_party/git/t/t1020-subdirectory.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006 Junio C Hamano
-#
-
-test_description='Try various core-level commands in subdirectory.
-'
-
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-read-tree.sh
-
-test_expect_success setup '
-	long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
-	for c in $long; do echo $c; done >one &&
-	mkdir dir &&
-	for c in x y z $long a b c; do echo $c; done >dir/two &&
-	cp one original.one &&
-	cp dir/two original.two
-'
-
-test_expect_success 'update-index and ls-files' '
-	git update-index --add one &&
-	case "$(git ls-files)" in
-	one) echo pass one ;;
-	*) echo bad one; exit 1 ;;
-	esac &&
-	(
-		cd dir &&
-		git update-index --add two &&
-		case "$(git ls-files)" in
-		two) echo pass two ;;
-		*) echo bad two; exit 1 ;;
-		esac
-	) &&
-	case "$(git ls-files)" in
-	dir/two"$LF"one) echo pass both ;;
-	*) echo bad; exit 1 ;;
-	esac
-'
-
-test_expect_success 'cat-file' '
-	two=$(git ls-files -s dir/two) &&
-	two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
-	echo "$two" &&
-	git cat-file -p "$two" >actual &&
-	cmp dir/two actual &&
-	(
-		cd dir &&
-		git cat-file -p "$two" >actual &&
-		cmp two actual
-	)
-'
-rm -f actual dir/actual
-
-test_expect_success 'diff-files' '
-	echo a >>one &&
-	echo d >>dir/two &&
-	case "$(git diff-files --name-only)" in
-	dir/two"$LF"one) echo pass top ;;
-	*) echo bad top; exit 1 ;;
-	esac &&
-	# diff should not omit leading paths
-	(
-		cd dir &&
-		case "$(git diff-files --name-only)" in
-		dir/two"$LF"one) echo pass subdir ;;
-		*) echo bad subdir; exit 1 ;;
-		esac &&
-		case "$(git diff-files --name-only .)" in
-		dir/two) echo pass subdir limited ;;
-		*) echo bad subdir limited; exit 1 ;;
-		esac
-	)
-'
-
-test_expect_success 'write-tree' '
-	top=$(git write-tree) &&
-	echo $top &&
-	(
-		cd dir &&
-		sub=$(git write-tree) &&
-		echo $sub &&
-		test "z$top" = "z$sub"
-	)
-'
-
-test_expect_success 'checkout-index' '
-	git checkout-index -f -u one &&
-	cmp one original.one &&
-	(
-		cd dir &&
-		git checkout-index -f -u two &&
-		cmp two ../original.two
-	)
-'
-
-test_expect_success 'read-tree' '
-	rm -f one dir/two &&
-	tree=$(git write-tree) &&
-	read_tree_u_must_succeed --reset -u "$tree" &&
-	cmp one original.one &&
-	cmp dir/two original.two &&
-	(
-		cd dir &&
-		rm -f two &&
-		read_tree_u_must_succeed --reset -u "$tree" &&
-		cmp two ../original.two &&
-		cmp ../one ../original.one
-	)
-'
-
-test_expect_success 'alias expansion' '
-	(
-		git config alias.test-status-alias status &&
-		cd dir &&
-		git status &&
-		git test-status-alias
-	)
-'
-
-test_expect_success !MINGW '!alias expansion' '
-	pwd >expect &&
-	(
-		git config alias.test-alias-directory !pwd &&
-		cd dir &&
-		git test-alias-directory >../actual
-	) &&
-	test_cmp expect actual
-'
-
-test_expect_success 'GIT_PREFIX for !alias' '
-	printf "dir/" >expect &&
-	(
-		git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&
-		cd dir &&
-		git test-alias-directory >../actual
-	) &&
-	test_cmp expect actual
-'
-
-test_expect_success 'GIT_PREFIX for built-ins' '
-	# Use GIT_EXTERNAL_DIFF to test that the "diff" built-in
-	# receives the GIT_PREFIX variable.
-	echo "dir/" >expect &&
-	write_script diff <<-\EOF &&
-	printf "%s\n" "$GIT_PREFIX"
-	EOF
-	(
-		cd dir &&
-		echo "change" >two &&
-		GIT_EXTERNAL_DIFF=./diff git diff >../actual &&
-		git checkout -- two
-	) &&
-	test_cmp expect actual
-'
-
-test_expect_success 'no file/rev ambiguity check inside .git' '
-	git commit -a -m 1 &&
-	(
-		cd .git &&
-		git show -s HEAD
-	)
-'
-
-test_expect_success 'no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)' '
-	test_when_finished "rm -fr foo.git" &&
-	git clone -s --bare .git foo.git &&
-	(
-		cd foo.git &&
-		# older Git needed help by exporting GIT_DIR=.
-		# to realize that it is inside a bare repository.
-		# We keep this test around for regression testing.
-		GIT_DIR=. git show -s HEAD
-	)
-'
-
-test_expect_success 'no file/rev ambiguity check inside a bare repo' '
-	test_when_finished "rm -fr foo.git" &&
-	git clone -s --bare .git foo.git &&
-	(
-		cd foo.git &&
-		git show -s HEAD
-	)
-'
-
-test_expect_success SYMLINKS 'detection should not be fooled by a symlink' '
-	git clone -s .git another &&
-	ln -s another yetanother &&
-	(
-		cd yetanother/.git &&
-		git show -s HEAD
-	)
-'
-
-test_done