summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 19:59:41 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 20:18:27 +0100
commit6320a38e58a33f648f701d43946831fc166fab6f (patch)
treeb16ddeee45374e7fcec6d4e89fb3b4406ed00426 /git-debrebase
parent4323fe5c8a3904f55b18e516b6b02a8e3e0527e4 (diff)
git-debrebase: convert-from-gbp; on stitch failure, clarify message
Clarify what the preceding failure messages mean, and what the consequences are. This is part of #906641. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 6abc86d..eabf5ad 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2489,7 +2489,11 @@ END
if (!$previous_dgit_view) {
$@ =~ s/^\n+//;
chomp $@;
- print STDERR "cannot stitch in dgit view: $@\n";
+ print STDERR <<END;
+Cannot confirm dgit view: $@
+Failed to stitch in dgit view (see messages above).
+dgit --overwrite will be needed on the first dgit push after conversion.
+END
}
snags_maybe_bail_early();