From fc195d8bd6b54576347318605c7091b526dbdfc6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 01:22:01 +0100 Subject: [PATCH] dgit: quilt fixup error messages: Change hint emphasis * 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 --- dgit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index 42813f1f..ab618056 100755 --- 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, -- 2.30.2