From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 27 Jun 2018 00:26:49 +0000 (+0100)
Subject: dgit: Better message formatting when --overwrite may be needed
X-Git-Tag: archive/debian/5.3~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=05babd80e5414230f567ac26bf3d5118aa595320;p=dgit.git

dgit: Better message formatting when --overwrite may be needed

Closes:891031.

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

diff --git a/debian/changelog b/debian/changelog
index 4a0883ca..724f7843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ dgit (5.3~) unstable; urgency=medium
   * git-debrebase new-upstream: Provide better reflog entries
     by setting GIT_REFLOG_ACTION.  Closes:#901925.
 
+  Improvements:
+  * Better message formatting when --overwrite may be needed,
+    and a note about first dgit push in dgit(1).  Closes:891031.
+
  --
 
 dgit (5.2) unstable; urgency=medium
diff --git a/dgit b/dgit
index d18cc73b..1559a023 100755
--- a/dgit
+++ b/dgit
@@ -4013,10 +4013,12 @@ sub splitbrain_pseudomerge ($$$$) {
 	infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
 	1;
     }) {
+        $@ =~ s/^\n//; chomp $@;
 	print STDERR <<END;
-$us: check failed (maybe --overwrite is needed, consult documentation)
+$@
+| Not fast forward; maybe --overwrite is needed, see dgit(1)
 END
-	die "$@";
+	finish -1;
     }
 
     my $r = pseudomerge_make_commit