diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | git-debrebase | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index dc87466..3948db7 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 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) { |