chiark / gitweb /
dgit: quilt fixup error messages: Change hint emphasis
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 20 Aug 2018 00:22:01 +0000 (01:22 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 20 Aug 2018 00:22:01 +0000 (01:22 +0100)
* No longer hint --quilt=smash or dpkg source --commit.  These are
  rarely the right thing.

* Hint about bad origs, instead.  This is fairly common.

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

diff --git a/dgit b/dgit
index 42813f1..ab61805 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5373,8 +5373,7 @@ sub quiltify ($$$$) {
            }
            print STDERR "$us: $_\n" foreach @$failsuggestion;
            fail
- "quilt history linearisation failed.  Search \`quilt fixup' in dgit(7).\n".
- "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
+ "quilt history linearisation failed.  Search \`quilt fixup' in dgit(7).\n";
        } elsif ($quilt_mode eq 'smash') {
        } elsif ($quilt_mode eq 'auto') {
            progress "quilt fixup cannot be linear, smashing...";
@@ -5920,7 +5919,8 @@ END
         push @failsuggestion, "This might be a patches-applied branch.";
     }
     push @failsuggestion, "Maybe you need to specify one of".
-        " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
+        " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?",
+ "Or, maybe orig tarball(s) are not identical to git representation?";
 
     if (quiltmode_splitbrain()) {
        quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,