From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 11:41:23 +0000 (+0100)
Subject: Split brain: Improve quiltify() message
X-Git-Tag: archive/debian/2.0~323
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=561bf70f8de802ba788e3d2f3be787015e5b02c0

Split brain: Improve quiltify() message

Actually --quilt=gbp and --quilt=unapplied (well, what's called
--quilt=apply here) aren't going to be quite identical.
---

diff --git a/dgit b/dgit
index 2c72213a..295bbdf1 100755
--- a/dgit
+++ b/dgit
@@ -2682,7 +2682,7 @@ sub quiltify ($$$$) {
 	    if (quilt_could_gbp($target,$unapplied,$oldtiptree)) {
 		print STDERR <<END;
 $us: Tree looks like a patches-unapplied git branch.
-$us: Maybe you forgot --quilt=gbp (aka --quilt=apply) ?
+$us: Maybe you forgot --quilt=gbp (or --quilt=apply) ?
 END
 	    }
 	    fail "quilt fixup naive history linearisation failed.\n".