add -p: mark split hunks as undecided

When a hunk is split, each of the new hunks inherits whether it is
selected or not from the original hunk. If a selected hunk is split
all of the new hunks are marked as "selected" and the user is only
prompted with the first of the split hunks. The user is not asked
whether or not they wish to select the rest of the new hunks. This
means that if they wish to deselect any of the new hunks apart from
the first one they have to navigate back to the hunk they want to
deselect before they can deselect it. This is unfortunate as the user
is presumably splitting the original hunk because they only want to
select some sub-set of it.

Instead mark all the new hunks as "undecided" so that the user is
prompted whether they wish to select each one in turn. In the case
where the user only wants to change the selection of the first of
the split hunks they will now have to do more work re-selecting the
remaining split hunks. However, changing the selection of any of the
other newly created hunks is now much simpler as the user no-longer has
to navigate back to them in order to change their selected state.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/add-patch.c b/add-patch.c
index 302e6ba7d9a35322b951681418c1ab62cd9fed40..61f42de9ea94e6e8d1cc7305993628312846ba6f 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -956,6 +956,7 @@ static int split_hunk(struct add_p_state *s, struct file_diff *file_diff,
                        * sizeof(*hunk));
        hunk = file_diff->hunk + hunk_index;
        hunk->splittable_into = 1;
+       hunk->use = UNDECIDED_HUNK;
        memset(hunk + 1, 0, (splittable_into - 1) * sizeof(*hunk));
 
        header = &hunk->header;
@@ -1057,7 +1058,7 @@ next_hunk_line:
 
                hunk++;
                hunk->splittable_into = 1;
-               hunk->use = hunk[-1].use;
+               hunk->use = UNDECIDED_HUNK;
                header = &hunk->header;
 
                header->old_count = header->new_count = context_line_count;

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 04d2a1983525313afbdd19da4fa0368c8e495361..a6829fd0859d1ca0e4c14a29ea9eda7ed0928b03 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -1301,4 +1301,14 @@ do
        '
 done
 
+test_expect_success 'splitting previous hunk marks split hunks as undecided' '
+       test_write_lines a " " b c d e f g h i j k >file &&
+       git add file &&
+       test_write_lines x " " b y d e f g h i j x >file &&
+       test_write_lines n K s n y q | git add -p file &&
+       git cat-file blob :file >actual &&
+       test_write_lines a " " b y d e f g h i j k >expect &&
+       test_cmp expect actual
+'
+
 test_done