about summary refs log tree commit diff
path: root/third_party/git/t/t4254-am-corrupt.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/t4254-am-corrupt.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/t4254-am-corrupt.sh')
-rwxr-xr-xthird_party/git/t/t4254-am-corrupt.sh82
1 files changed, 0 insertions, 82 deletions
diff --git a/third_party/git/t/t4254-am-corrupt.sh b/third_party/git/t/t4254-am-corrupt.sh
deleted file mode 100755
index daf01c309d03..000000000000
--- a/third_party/git/t/t4254-am-corrupt.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-test_description='git am with corrupt input'
-. ./test-lib.sh
-
-make_mbox_with_nul () {
-	space=' '
-	q_nul_in_subject=
-	q_nul_in_body=
-	while test $# -ne 0
-	do
-		case "$1" in
-		subject) q_nul_in_subject='=00' ;;
-		body)    q_nul_in_body='=00' ;;
-		esac &&
-		shift
-	done &&
-	cat <<-EOF
-	From ec7364544f690c560304f5a5de9428ea3b978b26 Mon Sep 17 00:00:00 2001
-	From: A U Thor <author@example.com>
-	Date: Sun, 19 Apr 2020 13:42:07 +0700
-	Subject: [PATCH] =?ISO-8859-1?q?=C4=CB${q_nul_in_subject}=D1=CF=D6?=
-	MIME-Version: 1.0
-	Content-Type: text/plain; charset=ISO-8859-1
-	Content-Transfer-Encoding: quoted-printable
-
-	abc${q_nul_in_body}def
-	---
-	diff --git a/afile b/afile
-	new file mode 100644
-	index 0000000000..e69de29bb2
-	--$space
-	2.26.1
-	EOF
-}
-
-test_expect_success setup '
-	# Note the missing "+++" line:
-	cat >bad-patch.diff <<-\EOF &&
-	From: A U Thor <au.thor@example.com>
-	diff --git a/f b/f
-	index 7898192..6178079 100644
-	--- a/f
-	@@ -1 +1 @@
-	-a
-	+b
-	EOF
-
-	echo a >f &&
-	git add f &&
-	test_tick &&
-	git commit -m initial
-'
-
-# This used to fail before, too, but with a different diagnostic.
-#   fatal: unable to write file '(null)' mode 100644: Bad address
-# Also, it had the unwanted side-effect of deleting f.
-test_expect_success 'try to apply corrupted patch' '
-	test_when_finished "git am --abort" &&
-	test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual &&
-	echo "error: git diff header lacks filename information (line 4)" >expected &&
-	test_path_is_file f &&
-	test_i18ncmp expected actual
-'
-
-test_expect_success "NUL in commit message's body" '
-	test_when_finished "git am --abort" &&
-	make_mbox_with_nul body >body.patch &&
-	test_must_fail git am body.patch 2>err &&
-	grep "a NUL byte in commit log message not allowed" err
-'
-
-test_expect_success "NUL in commit message's header" "
-	test_when_finished 'git am --abort' &&
-	make_mbox_with_nul subject >subject.patch &&
-	test_must_fail git mailinfo msg patch <subject.patch 2>err &&
-	grep \"a NUL byte in 'Subject' is not allowed\" err &&
-	test_must_fail git am subject.patch 2>err &&
-	grep \"a NUL byte in 'Subject' is not allowed\" err
-"
-
-test_done