Re: [PATCH v3] apply.c: fix -p argument parsing

From: Jeff King <peff@peff.net>
Date: Mar 13, 2026, 00:16 UTC
Message-ID: <20260313001629.GA3193660@coredump.intra.peff.net>
In-Reply-To: <20260310050621.3849719-1-mroik@delayed.space>

On Tue, Mar 10, 2026 at 06:06:15AM +0100, Mirko Faina wrote:

Show 13 quoted lines

> diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
> index 697e86c0ff..3fdcfecc52 100755
> --- a/t/t4120-apply-popt.sh
> +++ b/t/t4120-apply-popt.sh
> @@ -23,6 +23,27 @@ test_expect_success setup '
>  	rmdir süb
>  '
>  
> +test_expect_success 'git apply -p 1 patch' '
> +	test_when_finished "rm -rf t" &&
> +	git apply -p 1 $TEST_DIRECTORY/t4120/patch &&
> +	test_path_is_dir t
> +'

This test seems to fail on Windows. From CI:

    ++ git apply -p 1 /d/a/git/git/t/t4120/patch
    error: git diff header lacks filename information when removing 1 leading pathname component (line 14)
    error: last command exited with $?=128

but I can't figure out why (and don't have a local Windows machine to test on easily).

> diff --git a/t/t4120/patch b/t/t4120/patch

Not related to the failure, but IMHO we should keep small data like this in the script itself, rather than as auxiliary files. The t/ directory is already quite crowded, and it is often easier to refer to it when it's near the tests themselves.

You don't even need the full email, just the patch part. (You might even be able to reuse one of the other patches we make in the script, but I didn't check).

Something like this would work. Note that it also gets rid of bare references to $TEST_DIRECTORY, which really ought to be quoted (unlike $TRASH_DIRECTORY, it does not always have a space, but it depends on where somebody places their clone of git.git).

 t/t4120-apply-popt.sh | 16 ++++++++++++----
 t/t4120/patch         | 15 ---------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
index 3fdcfecc52..0531a19ee8 100755
--- a/t/t4120-apply-popt.sh
+++ b/t/t4120-apply-popt.sh
@@ -23,25 +23,33 @@ test_expect_success setup '
 	rmdir süb
 '
 
+test_expect_success 'setup deep subdir patch' '
+	cat >patch.deep <<-\EOF
+	diff --git a/t/test/test b/t/test/test
+	new file mode 100644
+	index 0000000000..e69de29bb2
+	EOF
+'
+
 test_expect_success 'git apply -p 1 patch' '
 	test_when_finished "rm -rf t" &&
-	git apply -p 1 $TEST_DIRECTORY/t4120/patch &&
+	git apply -p 1 patch.deep &&
 	test_path_is_dir t
 '
 
 test_expect_success 'apply fails due to non-num -p' '
 	test_when_finished "rm -rf t test" &&
-	test_must_fail git apply -p malformed $TEST_DIRECTORY/t4120/patch
+	test_must_fail git apply -p malformed patch.deep
 '
 
 test_expect_success 'apply fails due to trailing non-digit in -p' '
 	test_when_finished "rm -rf t test" &&
-	test_must_fail git apply -p 2q $TEST_DIRECTORY/t4120/patch
+	test_must_fail git apply -p 2q patch.deep
 '
 
 test_expect_success 'apply fails due to negative number in -p' '
 	test_when_finished "rm -rf t test" &&
-	test_must_fail git apply -p -1 $TEST_DIRECTORY/t4120/patch
+	test_must_fail git apply -p -1 patch.deep
 '
 
 test_expect_success 'apply git diff with -p2' '
diff --git a/t/t4120/patch b/t/t4120/patch
deleted file mode 100644
index bfccc708dd..0000000000
--- a/t/t4120/patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From 90ad11d5b2d437e82d4d992f72fb44c2227798b5 Mon Sep 17 00:00:00 2001
-From: Mroik <mroik@delayed.space>
-Date: Mon, 9 Mar 2026 23:25:00 +0100
-Subject: [PATCH] Test
-
----
- t/test/test | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t/test/test
-
-diff --git a/t/test/test b/t/test/test
-new file mode 100644
-index 0000000000..e69de29bb2
---
-2.53.0.851.ga537e3e6e9