add--interactive: ignore mode change in 'p'atch command

When a path is examined in the patch subcommand, any mode changes in
the file are given to use in the diff header by git-diff. If no hunks
are staged, then we throw out that header and do not touch the
path.  But if _any_ hunks are staged, we use the header, and the mode
is changed together with the contents.

Since the 'p'atch command should just be dealing with hunks that are
shown to the user, it makes sense to just ignore mode changes
entirely. We do squirrel away the mode, though, since the next patch
will allow users to select the mode update separately.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index a0a81f134a6288dfc1d87431698f29597ed5e488..5cdda29c548fd8aa776622b6a698516d8ca386e4 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -550,6 +550,21 @@ sub parse_diff {
        return @hunk;
 }
 
        return @hunk;
 }
 

+sub parse_diff_header {
+       my $src = shift;
+
+       my $head = { TEXT => [], DISPLAY => [] };
+       my $mode = { TEXT => [], DISPLAY => [] };
+
+       for (my $i = 0; $i < @{$src->{TEXT}}; $i++) {
+               my $dest = $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ?
+                       $mode : $head;
+               push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
+               push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
+       }
+       return ($head, $mode);
+}
+

 sub hunk_splittable {
        my ($text) = @_;
 
 sub hunk_splittable {
        my ($text) = @_;
 


@@ -795,6 +810,7 @@ sub patch_update_file {
        my ($ix, $num);
        my $path = shift;
        my ($head, @hunk) = parse_diff($path);
        my ($ix, $num);
        my $path = shift;
        my ($head, @hunk) = parse_diff($path);

+       ($head, my $mode) = parse_diff_header($head);

        for (@{$head->{DISPLAY}}) {
                print;
        }
        for (@{$head->{DISPLAY}}) {
                print;
        }

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 77c90f6fa002ce00c3ffb30d0b79adaff46b3caa..d920d06d5a8e1f5c09f2f0a2d5a77da1b59cdccf 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -66,4 +66,13 @@ test_expect_success 'revert works (commit)' '
        grep "unchanged *+3/-0 file" output
 '
 
        grep "unchanged *+3/-0 file" output
 '
 

+test_expect_success 'patch does not affect mode' '
+       git reset --hard &&
+       echo content >>file &&
+       chmod +x file &&
+       printf "y\\n" | git add -p &&
+       git show :file | grep content &&
+       git diff file | grep "new mode"
+'
+

 test_done
 test_done