[PATCH 1/2] add--interactive: ignore mode change in 'p'atch command
From: Jeff King <hidden>
Date: 2016-06-15 22:44:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/2] add--interactive: ignore mode change in 'p'atch command · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/2] add--interactive: ignore mode change in 'p'atch command · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH 1/2] add--interactive: ignore mode change in 'p'atch command · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/2] add--interactive: ignore mode change in 'p'atch command · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH 1/2] add--interactive: ignore mode change in 'p'atch command · Jeff King <hidden>
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. But if _any_ hunks are staged, we use the header, and the mode is changed. 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 a future patch will allow users to select the mode update. Signed-off-by: Jeff King <redacted> --- Like I said, I don't necessarily like this behavior, but it is a stepping stone to 1/2. git-add--interactive.perl | 16 ++++++++++++++++ t/t3701-add-interactive.sh | 9 +++++++++ 2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index a0a81f1..5cdda29 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl@@ -550,6 +550,21 @@ sub parse_diff { 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) = @_;
@@ -795,6 +810,7 @@ sub patch_update_file { my ($ix, $num); my $path = shift; my ($head, @hunk) = parse_diff($path); + ($head, my $mode) = parse_diff_header($head); for (@{$head->{DISPLAY}}) { print; }
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 77c90f6..d920d06 100755
--- 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 ' +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
--
1.5.5.rc1.141.g50ecd.dirty