From cd06cd0cf3b1190fde3862684a18a1d7d56a834e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:37:39 +0100 Subject: [PATCH] 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 --- debian/changelog | 2 ++ git-debrebase | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc874663..3948db71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: convert-from-gbp: Use same algorithm for finding upstream commitish as new-upstream. Closes:#905062. * git-debrebase: Improve error messages for bad options. + * git-debrebase: Improve error message for convert-from-gbp + upstream discrepancy. Closes:#905078. -- diff --git a/git-debrebase b/git-debrebase index 439a10a7..13ca472d 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 <