From 4f8b1a2d11988e1b793149b3c7058e50b7d96f69 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Aug 2018 00:44:51 +0100
Subject: 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>
---
 dgit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 5e9d711..0374b47 100755
--- 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 =
-- 
cgit v1.2.3