Subject: [PATCH] add-patch: roll over to next undecided hunk

From: René Scharfe <[email-masked]>
Date: Fri, 3 Oct 2025 14:16:44 +0200

git add --patch presents diff hunks one after the other, asking whether
to add them.  If we mark some as undecided, e.g. with J, then it will
start over after reaching the last hunk.  It always starts over at the
very first hunk, though, even if we already decided on it.  Skip
decided hunks when rolling over instead.

Reported-by: Windl, Ulrich <[email-masked]>
Signed-off-by: René Scharfe <[email-masked]>
---
 add-patch.c                |  9 ++++++++-
 t/t3701-add-interactive.sh | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/add-patch.c b/add-patch.c
index b0389c5d5b..42a8394c92 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -1436,8 +1436,15 @@ static int patch_update_file(struct add_p_state *s,
 	render_diff_header(s, file_diff, colored, &s->buf);
 	fputs(s->buf.buf, stdout);
 	for (;;) {
-		if (hunk_index >= file_diff->hunk_nr)
+		if (hunk_index >= file_diff->hunk_nr) {
 			hunk_index = 0;
+			for (i = 0; i < file_diff->hunk_nr; i++) {
+				if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
+					hunk_index = i;
+					break;
+				}
+			}
+		}
 		hunk = file_diff->hunk_nr
 				? file_diff->hunk + hunk_index
 				: &file_diff->head;
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index d9fe289a7a..fa6ec5f835 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -1321,6 +1321,26 @@ test_expect_success 'stash accepts -U and --inter-hunk-context' '
 	test_grep "@@ -2,20 +2,20 @@" actual
 '
 
+test_expect_success 'roll over to next undecided (1)' '
+	test_write_lines a b c d e f g h i j k l m n o p q >file &&
+	git add file &&
+	test_write_lines X b c d e f g h X j k l m n o p X >file &&
+	test_write_lines J y y q | git add -p >actual &&
+	test_write_lines 1 2 3 1 >expect &&
+	sed -ne "s-/.*--" -e "s-^(--p" <actual >hunks &&
+	test_cmp expect hunks
+'
+
+test_expect_success 'roll over to next undecided (2)' '
+	test_write_lines a b c d e f g h i j k l m n o p q >file &&
+	git add file &&
+	test_write_lines X b c d e f g h X j k l m n o p X >file &&
+	test_write_lines y J y q | git add -p >actual &&
+	test_write_lines 1 2 3 2 >expect &&
+	sed -ne "s-/.*--" -e "s-^(--p" <actual >hunks &&
+	test_cmp expect hunks
+'
+
 test_expect_success 'set up base for -p color tests' '
 	echo commit >file &&
 	git commit -am "commit state" &&
-- 
2.51.0