diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-26 16:36:23 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-26 16:36:23 +0100 |
| commit | d833b697cbd9e0b743b79242209c78651845f559 (patch) | |
| tree | 570012fed1b5fe8a6ba716bcc53fe89c1327635e /dgit | |
| parent | 2c84b46d621bb5908bbfc64b9fcb12c30ab6b4a2 (diff) | |
Improve error message for non-fast-forward push. Closes: #720896.
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -984,7 +984,10 @@ sub cmd_push { git_fetch_us(); } if (fetch_from_archive()) { - is_fast_fwd(lrref(), 'HEAD') or die; + is_fast_fwd(lrref(), 'HEAD') or + fail "dgit push: HEAD is not a descendant". + " of the archive's version.\n". + "$us: To overwrite it, use git-merge -s ours ".lrref()."."; } else { $new_package or fail "package appears to be new in this suite;". |