mirrors/git
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
parent 493e433277 e1327ed5fb
commit 919451330b
2 changed files with 31 additions and 1 deletions
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();