diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-31 13:37:39 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-31 13:38:19 +0100 |
| commit | cd06cd0cf3b1190fde3862684a18a1d7d56a834e (patch) | |
| tree | c61612cb2bd49737d46057c8e30ac7d586fb7b2d /git-debrebase | |
| parent | e5d430e4208757b874443779b75ca884a143aa6a (diff) | |
git-debrebase: Improve error message for convert-from-gbp upstream discrepancy
Closes:#905078.
I don't intend to print `small' diffs because I think that kind of
dwim is probably more annoying than helpful.
I don't intend to factor this kind of pattern out throughout because:
The messages for these commands are generally not the actual diff rune
dgit or gdr ran, for various reasons (notably that dgit/gdr often use
object hashes). The result is that there is little duplication.
So I think the situation now is OK.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index 439a10a..13ca472 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1627,10 +1627,14 @@ sub cmd_convert_from_gbp () { my $upsdiff = get_differs $upstream, $old_head; if ($upsdiff & D_UPS) { - runcmd @git, qw(--no-pager diff), + runcmd @git, qw(--no-pager diff --stat), $upstream, $old_head, qw( -- :!/debian :/); - fail "upstream ($upstream_spec) and HEAD are not identical in upstream files"; + fail <<END; +upstream ($upstream_spec) and HEAD are not +identical in upstream files. See diffstat above, or run + git diff $upstream_spec HEAD -- :!/debian :/ +END } if (!is_fast_fwd $upstream, $old_head) { |