git-debrebase: Do not abandon quilt fixup at gdr split commits

One of these might well be in the delta queue somehow.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit b/dgit
index 5e9d7114bd3b143c40d76aec609c0b3c52ad4923..0374b472504551f6d86f51f1537289ef8c43e4a1 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5381,7 +5381,7 @@ sub quiltify ($$$$) {
                print STDERR "$us:  ", $reportnot->($notp), "\n";
                $all_gdr &&= $notp->{Child} &&
                    (git_cat_file $notp->{Child}{Commit}, 'commit')
                print STDERR "$us:  ", $reportnot->($notp), "\n";
                $all_gdr &&= $notp->{Child} &&
                    (git_cat_file $notp->{Child}{Commit}, 'commit')

-                   =~ m{^\[git-debrebase.*\]$}m;
+                   =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;

            }
            print STDERR "\n";
            $failsuggestion =
            }
            print STDERR "\n";
            $failsuggestion =