chiark / gitweb /
Split brain: Improve quiltify() message
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 11:41:23 +0000 (12:41 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000 (16:47 +0100)
Actually --quilt=gbp and --quilt=unapplied (well, what's called
--quilt=apply here) aren't going to be quite identical.

dgit

diff --git a/dgit b/dgit
index 2c72213..295bbdf 100755 (executable)
--- 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".