about summary refs log tree commit diff
path: root/third_party/git/t/t4130-apply-criss-cross-rename.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/t4130-apply-criss-cross-rename.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/t4130-apply-criss-cross-rename.sh')
-rwxr-xr-xthird_party/git/t/t4130-apply-criss-cross-rename.sh70
1 files changed, 0 insertions, 70 deletions
diff --git a/third_party/git/t/t4130-apply-criss-cross-rename.sh b/third_party/git/t/t4130-apply-criss-cross-rename.sh
deleted file mode 100755
index f8a313bcb98c..000000000000
--- a/third_party/git/t/t4130-apply-criss-cross-rename.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-test_description='git apply handling criss-cross rename patch.'
-. ./test-lib.sh
-
-create_file() {
-	cnt=0
-	while test $cnt -le 100
-	do
-		cnt=$(($cnt + 1))
-		echo "$2" >> "$1"
-	done
-}
-
-test_expect_success 'setup' '
-	# Ensure that file sizes are different, because on Windows
-	# lstat() does not discover inode numbers, and we need
-	# other properties to discover swapped files
-	# (mtime is not always different, either).
-	create_file file1 "some content" &&
-	create_file file2 "some other content" &&
-	create_file file3 "again something else" &&
-	git add file1 file2 file3 &&
-	git commit -m 1
-'
-
-test_expect_success 'criss-cross rename' '
-	mv file1 tmp &&
-	mv file2 file1 &&
-	mv tmp file2 &&
-	cp file1 file1-swapped &&
-	cp file2 file2-swapped
-'
-
-test_expect_success 'diff -M -B' '
-	git diff -M -B > diff &&
-	git reset --hard
-
-'
-
-test_expect_success 'apply' '
-	git apply diff &&
-	test_cmp file1 file1-swapped &&
-	test_cmp file2 file2-swapped
-'
-
-test_expect_success 'criss-cross rename' '
-	git reset --hard &&
-	mv file1 tmp &&
-	mv file2 file1 &&
-	mv file3 file2 &&
-	mv tmp file3 &&
-	cp file1 file1-swapped &&
-	cp file2 file2-swapped &&
-	cp file3 file3-swapped
-'
-
-test_expect_success 'diff -M -B' '
-	git diff -M -B > diff &&
-	git reset --hard
-'
-
-test_expect_success 'apply' '
-	git apply diff &&
-	test_cmp file1 file1-swapped &&
-	test_cmp file2 file2-swapped &&
-	test_cmp file3 file3-swapped
-'
-
-test_done