X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=git-add--interactive.perl;h=06f70602cc619e9e13bdc609a43780ce8bc6570d;hb=bba287531b3a845faa032a8fef3e6d70d185c89b;hp=a06172c69f59391a04b75a3866a3fbcb98a21ba0;hpb=1af4731b5435e708355f20463a458493aa0e5aca;p=git.git

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index a06172c69..06f70602c 100755
--- 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 &&
@@ -1317,7 +1321,6 @@ sub patch_update_file {
 		open $fh, '| git apply --cached --recount';
 		for (@{$head->{TEXT}}, @result) {
 			print $fh $_;
-			print STDERR $_;
 		}
 		if (!close $fh) {
 			for (@{$head->{TEXT}}, @result) {