summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-27 01:26:49 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-27 01:27:59 +0100
commit05babd80e5414230f567ac26bf3d5118aa595320 (patch)
tree4ccc32f9a569bc629f65a10a0974069c4e298750
parent6ff90ffc23a2d6a400d3c72d6caedf62da92b037 (diff)
dgit: Better message formatting when --overwrite may be needed
Closes:891031. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog4
-rwxr-xr-xdgit6
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 4a0883c..724f784 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 d18cc73..1559a02 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