mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/add-patch-enforce-single-letter-input'

Browse Source 
"git add -p" learned to complain when an answer with more than one
letter is given to a prompt that expects a single letter answer.

* jc/add-patch-enforce-single-letter-input:
  add-patch: enforce only one-letter response to prompts
This commit is contained in:
Junio C Hamano
2024-05-30 14:15:16 -07:00
parent 99d3cbe21b d3f616a4e5
commit d019b80d4f
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
add-patch.c
View File

@ -1227,6 +1227,7 @@ static int prompt_yesno(struct add_p_state *s, const char *prompt)
fflush(stdout);
if (read_single_character(s) == EOF)
return -1;
/* do not limit to 1-byte input to allow 'no' etc. */
switch (tolower(s->answer.buf[0])) {
case 'n': return 0;
case 'y': return 1;
@ -1510,6 +1511,12 @@ static int patch_update_file(struct add_p_state *s,
if (!s->answer.len)
continue;
ch = tolower(s->answer.buf[0]);
/* 'g' takes a hunk number and '/' takes a regexp */
if (s->answer.len != 1 && (ch != 'g' && ch != '/')) {
err(s, _("Only one letter is expected, got '%s'"), s->answer.buf);
continue;
}
if (ch == 'y') {
hunk->use = USE_HUNK;
soft_increment:

38
t/t3701-add-interactive.sh
View File

@ -160,6 +160,14 @@ test_expect_success 'revert works (commit)' '
grep "unchanged *+3/-0 file" output
'
test_expect_success 'reject multi-key input' '
saved=$(git hash-object -w file) &&
test_when_finished "git cat-file blob $saved >file" &&
echo an extra line >>file &&
test_write_lines aa | git add -p >actual &&
test_grep "is expected, got ${SQ}aa${SQ}" actual
'
test_expect_success 'setup expected' '
cat >expected <<-\EOF
EOF
@ -526,7 +534,7 @@ test_expect_success 'split hunk setup' '
test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
'
test_expect_success 'goto hunk' '
test_expect_success 'goto hunk 1 with "g 1"' '
test_when_finished "git reset" &&
tr _ " " >expect <<-EOF &&
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? + 1: -1,2 +1,3 +15
@ -542,7 +550,20 @@ test_expect_success 'goto hunk' '
test_cmp expect actual.trimmed
'
test_expect_success 'navigate to hunk via regex' '
test_expect_success 'goto hunk 1 with "g1"' '
test_when_finished "git reset" &&
tr _ " " >expect <<-EOF &&
_10
+15
_20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
EOF
test_write_lines s y g1 | git add -p >actual &&
tail -n 4 <actual >actual.trimmed &&
test_cmp expect actual.trimmed
'
test_expect_success 'navigate to hunk via regex /pattern' '
test_when_finished "git reset" &&
tr _ " " >expect <<-EOF &&
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? @@ -1,2 +1,3 @@
@ -556,6 +577,19 @@ test_expect_success 'navigate to hunk via regex' '
test_cmp expect actual.trimmed
'
test_expect_success 'navigate to hunk via regex / pattern' '
test_when_finished "git reset" &&
tr _ " " >expect <<-EOF &&
_10
+15
_20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
EOF
test_write_lines s y / 1,2 | git add -p >actual &&
tail -n 4 <actual >actual.trimmed &&
test_cmp expect actual.trimmed
'
test_expect_success 'split hunk "add -p (edit)"' '
# Split, say Edit and do nothing. Then:
#