about summary refs log tree commit diff
path: root/third_party/git/t/t1005-read-tree-reset.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/t1005-read-tree-reset.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/t1005-read-tree-reset.sh')
-rwxr-xr-xthird_party/git/t/t1005-read-tree-reset.sh106
1 files changed, 0 insertions, 106 deletions
diff --git a/third_party/git/t/t1005-read-tree-reset.sh b/third_party/git/t/t1005-read-tree-reset.sh
deleted file mode 100755
index 83b09e131067..000000000000
--- a/third_party/git/t/t1005-read-tree-reset.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-test_description='read-tree -u --reset'
-
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-read-tree.sh
-
-# two-tree test
-
-test_expect_success 'setup' '
-	git init &&
-	mkdir df &&
-	echo content >df/file &&
-	git add df/file &&
-	git commit -m one &&
-	git ls-files >expect &&
-	rm -rf df &&
-	echo content >df &&
-	git add df &&
-	echo content >new &&
-	git add new &&
-	git commit -m two
-'
-
-test_expect_success 'reset should work' '
-	read_tree_u_must_succeed -u --reset HEAD^ &&
-	git ls-files >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'reset should remove remnants from a failed merge' '
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >actual &&
-	! test -f old
-'
-
-test_expect_success 'two-way reset should remove remnants too' '
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD HEAD &&
-	git ls-files -s >actual &&
-	! test -f old
-'
-
-test_expect_success 'Porcelain reset should remove remnants too' '
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git reset --hard &&
-	git ls-files -s >actual &&
-	! test -f old
-'
-
-test_expect_success 'Porcelain checkout -f should remove remnants too' '
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f &&
-	git ls-files -s >actual &&
-	! test -f old
-'
-
-test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f HEAD &&
-	git ls-files -s >actual &&
-	! test -f old
-'
-
-test_done