Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
push: make non-fast-forward help message configurable
[gitweb.git]
/
git-add--interactive.perl
diff --git
a/git-add--interactive.perl
b/git-add--interactive.perl
index df9f231635d2bc53073375971c1383966e2a140b..06f70602cc619e9e13bdc609a43780ce8bc6570d 100755
(executable)
--- a/
git-add--interactive.perl
+++ b/
git-add--interactive.perl
@@
-841,6
+841,10
@@
sub coalesce_overlapping_hunks {
my ($last_o_ctx, $last_was_dirty);
for (grep { $_->{USE} } @in) {
+ if ($_->{TYPE} ne 'hunk') {
+ push @out, $_;
+ next;
+ }
my $text = $_->{TEXT};
my ($o_ofs) = parse_hunk_header($text->[0]);
if (defined $last_o_ctx &&