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

[dgit.git] / dgit

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