add-patch: quit without skipping undecided hunks
Option q implies d, i.e., it marks any undecided hunks towards the bottom of the hunk array as skipped. This is unnecessary; later code treats undecided and skipped hunks the same: The only functions that use UNDECIDED_HUNK and SKIP_HUNK are patch_update_file() itself (but not after its big for loop) and its helpers get_first_undecided() and display_hunks(). Streamline the handling of option q by quitting immediately. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Oct 25, 2025 at 07:46 UTC
13768117f5e174a7a0403607532e33a7dc40b969
1 file changed
+4
-5
add-patch.c
+4
-5
@@ -1601,7 +1601,7 @@ soft_increment:
1601
} else if (hunk->use == UNDECIDED_HUNK) {
1602
hunk->use = USE_HUNK;
1603
}
1604
- } else if (ch == 'd' || ch == 'q') {
1604
+ } else if (ch == 'd') {
1605
if (file_diff->hunk_nr) {
1606
for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
1607
hunk = file_diff->hunk + hunk_index;
@@ -1613,10 +1613,9 @@ soft_increment:
1613
} else if (hunk->use == UNDECIDED_HUNK) {
1614
hunk->use = SKIP_HUNK;
1615
}
1616
- if (ch == 'q') {
1617
- quit = 1;
1618
- break;
1619
- }
1616
+ } else if (ch == 'q') {
1617
+ quit = 1;
1618
+ break;
1619
} else if (s->answer.buf[0] == 'K') {
1620
if (permitted & ALLOW_GOTO_PREVIOUS_HUNK)
1621
hunk_index = dec_mod(hunk_index,