chiark / gitweb /
git-debrebase: Do not abandon quilt fixup at gdr split commits
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 24 Aug 2018 23:44:51 +0000 (00:44 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 24 Aug 2018 23:44:51 +0000 (00:44 +0100)
One of these might well be in the delta queue somehow.

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

diff --git a/dgit b/dgit
index 5e9d711..0374b47 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')
-                   =~ m{^\[git-debrebase.*\]$}m;
+                   =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
            }
            print STDERR "\n";
            $failsuggestion =