From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 24 Aug 2018 23:44:51 +0000 (+0100)
Subject: git-debrebase: Do not abandon quilt fixup at gdr split commits
X-Git-Tag: archive/debian/6.10~58
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4f8b1a2d11988e1b793149b3c7058e50b7d96f69;ds=sidebyside

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 5e9d7114..0374b472 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 =