diff options
| author | René Scharfe <l.s.r@web.de> | 2025-10-25 07:46:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-25 09:45:07 -0700 |
| commit | 13768117f5e174a7a0403607532e33a7dc40b969 (patch) | |
| tree | 04e710083a9b21374afaaa7f3c563408c1aaa8f3 /add-patch.c | |
| parent | The twenty-fourth batch (diff) | |
| download | git-13768117f5e174a7a0403607532e33a7dc40b969.tar.gz git-13768117f5e174a7a0403607532e33a7dc40b969.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | add-patch.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/add-patch.c b/add-patch.c index ae9a20d8f2..a70def1f81 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1601,7 +1601,7 @@ soft_increment: } else if (hunk->use == UNDECIDED_HUNK) { hunk->use = USE_HUNK; } - } else if (ch == 'd' || ch == 'q') { + } else if (ch == 'd') { if (file_diff->hunk_nr) { for (; hunk_index < file_diff->hunk_nr; hunk_index++) { hunk = file_diff->hunk + hunk_index; @@ -1613,10 +1613,9 @@ soft_increment: } else if (hunk->use == UNDECIDED_HUNK) { hunk->use = SKIP_HUNK; } - if (ch == 'q') { - quit = 1; - break; - } + } else if (ch == 'q') { + quit = 1; + break; } else if (s->answer.buf[0] == 'K') { if (permitted & ALLOW_GOTO_PREVIOUS_HUNK) hunk_index = dec_mod(hunk_index, |