global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-11 09:29:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mf/apply-p-no-atoi' into jch

Browse Source 
* mf/apply-p-no-atoi:
  apply.c: fix -p argument parsing
This commit is contained in:
Junio C Hamano
2026-03-10 14:24:02 -07:00
parent cd94ed5f80 bb889238a5
commit f7948e8fb5
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apply.c
View File

@@ -4981,7 +4981,8 @@ static int apply_option_parse_p(const struct option *opt,
BUG_ON_OPT_NEG(unset);
state->p_value = atoi(arg);
if (strtol_i(arg, 10, &state->p_value) < 0 || state->p_value < 0)
die("<num> has to be a non-negative integer");
state->p_value_known = 1;
return 0;
}

21
t/t4120-apply-popt.sh
View File

@@ -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
'
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_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_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_expect_success 'apply git diff with -p2' '
cp file1.saved file1 &&
git apply -p2 patch.file

15
t/t4120/patch Normal file
View File

@@ -0,0 +1,15 @@
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