diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-27 01:26:49 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-27 01:27:59 +0100 |
commit | 05babd80e5414230f567ac26bf3d5118aa595320 (patch) | |
tree | 4ccc32f9a569bc629f65a10a0974069c4e298750 /dgit | |
parent | 6ff90ffc23a2d6a400d3c72d6caedf62da92b037 (diff) |
dgit: Better message formatting when --overwrite may be needed
Closes:891031.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |