about summary refs log tree commit diff
path: root/third_party/git/t/t2201-add-update-typechange.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/t2201-add-update-typechange.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/t2201-add-update-typechange.sh')
-rwxr-xr-xthird_party/git/t/t2201-add-update-typechange.sh148
1 files changed, 0 insertions, 148 deletions
diff --git a/third_party/git/t/t2201-add-update-typechange.sh b/third_party/git/t/t2201-add-update-typechange.sh
deleted file mode 100755
index a4eec0a3465b..000000000000
--- a/third_party/git/t/t2201-add-update-typechange.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/sh
-
-test_description='more git add -u'
-
-. ./test-lib.sh
-
-test_expect_success setup '
-	>xyzzy &&
-	_empty=$(git hash-object --stdin <xyzzy) &&
-	>yomin &&
-	>caskly &&
-	if test_have_prereq SYMLINKS; then
-		ln -s frotz nitfol &&
-		T_letter=T
-	else
-		printf %s frotz > nitfol &&
-		T_letter=M
-	fi &&
-	mkdir rezrov &&
-	>rezrov/bozbar &&
-	git add caskly xyzzy yomin nitfol rezrov/bozbar &&
-
-	test_tick &&
-	git commit -m initial
-
-'
-
-test_expect_success modify '
-	rm -f xyzzy yomin nitfol caskly &&
-	# caskly disappears (not a submodule)
-	mkdir caskly &&
-	# nitfol changes from symlink to regular
-	>nitfol &&
-	# rezrov/bozbar disappears
-	rm -fr rezrov &&
-	if test_have_prereq SYMLINKS; then
-		ln -s xyzzy rezrov
-	else
-		printf %s xyzzy > rezrov
-	fi &&
-	# xyzzy disappears (not a submodule)
-	mkdir xyzzy &&
-	echo gnusto >xyzzy/bozbar &&
-	# yomin gets replaced with a submodule
-	mkdir yomin &&
-	>yomin/yomin &&
-	(
-		cd yomin &&
-		git init &&
-		git add yomin &&
-		git commit -m "sub initial"
-	) &&
-	yomin=$(GIT_DIR=yomin/.git git rev-parse HEAD) &&
-	# yonk is added and then turned into a submodule
-	# this should appear as T in diff-files and as A in diff-index
-	>yonk &&
-	git add yonk &&
-	rm -f yonk &&
-	mkdir yonk &&
-	>yonk/yonk &&
-	(
-		cd yonk &&
-		git init &&
-		git add yonk &&
-		git commit -m "sub initial"
-	) &&
-	yonk=$(GIT_DIR=yonk/.git git rev-parse HEAD) &&
-	# zifmia is added and then removed
-	# this should appear in diff-files but not in diff-index.
-	>zifmia &&
-	git add zifmia &&
-	rm -f zifmia &&
-	mkdir zifmia &&
-	{
-		git ls-tree -r HEAD |
-		sed -e "s/^/:/" -e "
-			/	caskly/{
-				s/	caskly/ $ZERO_OID D&/
-				s/blob/000000/
-			}
-			/	nitfol/{
-				s/	nitfol/ $ZERO_OID $T_letter&/
-				s/blob/100644/
-			}
-			/	rezrov.bozbar/{
-				s/	rezrov.bozbar/ $ZERO_OID D&/
-				s/blob/000000/
-			}
-			/	xyzzy/{
-				s/	xyzzy/ $ZERO_OID D&/
-				s/blob/000000/
-			}
-			/	yomin/{
-			    s/	yomin/ $ZERO_OID T&/
-				s/blob/160000/
-			}
-		"
-	} >expect &&
-	{
-		cat expect
-		echo ":100644 160000 $_empty $ZERO_OID T	yonk"
-		echo ":100644 000000 $_empty $ZERO_OID D	zifmia"
-	} >expect-files &&
-	{
-		cat expect
-		echo ":000000 160000 $ZERO_OID $ZERO_OID A	yonk"
-	} >expect-index &&
-	{
-		echo "100644 $_empty 0	nitfol"
-		echo "160000 $yomin 0	yomin"
-		echo "160000 $yonk 0	yonk"
-	} >expect-final
-'
-
-test_expect_success diff-files '
-	git diff-files --raw >actual &&
-	test_cmp expect-files actual
-'
-
-test_expect_success diff-index '
-	git diff-index --raw HEAD -- >actual &&
-	test_cmp expect-index actual
-'
-
-test_expect_success 'add -u' '
-	rm -f ".git/saved-index" &&
-	cp -p ".git/index" ".git/saved-index" &&
-	git add -u &&
-	git ls-files -s >actual &&
-	test_cmp expect-final actual
-'
-
-test_expect_success 'commit -a' '
-	if test -f ".git/saved-index"
-	then
-		rm -f ".git/index" &&
-		mv ".git/saved-index" ".git/index"
-	fi &&
-	git commit -m "second" -a &&
-	git ls-files -s >actual &&
-	test_cmp expect-final actual &&
-	rm -f .git/index &&
-	git read-tree HEAD &&
-	git ls-files -s >actual &&
-	test_cmp expect-final actual
-'
-
-test_done