remote: refactor some logic into get_stale_heads()

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 8f66b825dd8310fa2160bb08bf0c50acb9ff4156..392efb913f7c2ff13bbbb46e4414325b71e07676 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -933,6 +933,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 &&