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 4a0883ca8ab83ceb485b666b483f6797455f791f..724f7843a6626e2cd5faffc3b4eaedec424ecd1a 100644 (file)
--- 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 d18cc73b000be7b6fefafb869f900d940e5bda09..1559a023928b4533017a232011889bf877084852 100755 (executable)
--- 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