undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-add--interactive-delete' into maint

Browse Source 
* jk/maint-add--interactive-delete:
  add-interactive: fix bogus diff header line ordering
This commit is contained in:
Junio C Hamano 2010-03-08 00:36:00 -08:00
commit 919451330b
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
git-add--interactive.perl
View File

@ -957,6 +957,28 @@ sub coalesce_overlapping_hunks {
return @out;
}
sub reassemble_patch {
my $head = shift;
my @patch;
# Include everything in the header except the beginning of the diff.
push @patch, (grep { !/^[-+]{3}/ } @$head);
# Then include any headers from the hunk lines, which must
# come before any actual hunk.
while (@_ && $_[0] !~ /^@/) {
push @patch, shift;
}
# Then begin the diff.
push @patch, grep { /^[-+]{3}/ } @$head;
# And then the actual hunks.
push @patch, @_;
return @patch;
}
sub color_diff {
return map {
colored((/^@/ ? $fraginfo_color :
@ -1453,7 +1475,7 @@ sub patch_update_file {
if (@result) {
my $fh;
my @patch = (@{$head->{TEXT}}, @result);
my @patch = reassemble_patch($head->{TEXT}, @result);
my $apply_routine = $patch_mode_flavour{APPLY};
&$apply_routine(@patch);
refresh();

8
t/t2016-checkout-patch.sh
View File

@ -66,6 +66,14 @@ test_expect_success 'git checkout -p HEAD^' '
verify_state dir/foo parent parent
'
test_expect_success 'git checkout -p handles deletion' '
set_state dir/foo work index &&
rm dir/foo &&
(echo n; echo y) | git checkout -p &&
verify_saved_state bar &&
verify_state dir/foo index index
'
# The idea in the rest is that bar sorts first, so we always say 'y'
# first and if the path limiter fails it'll apply to bar instead of
# dir/foo. There's always an extra 'n' to reject edits to dir/foo in