diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-03-01 18:36:50 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-03-01 20:35:22 +0000 |
| commit | 6123e69cb8bc61f112d455ca8df5b6c68fa7e6f6 (patch) | |
| tree | 2b1bcb8f21c247c3cf6f90c15d988e2a6a93a852 | |
| parent | 07228b643d0a07e1ec738b7c70fca5f4a6a58d68 (diff) | |
git-debrebase: convert-*: Fix two broken error messages
If you failed to specify the upstream version, some of the messages
would still attempt to report what you specified, causing a crash.
Closes: #922462
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | git-debrebase | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index 20e5728..efb0cea 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2563,7 +2563,7 @@ sub cmd_convert_from_gbp () { runcmd @git, qw(--no-pager diff --stat), $upstream, $old_head, qw( -- :!/debian :/); - fail f_ <<END, $upstream_spec, $upstream_spec; + fail f_ <<END, $upstream_used, $upstream; upstream (%s) and HEAD are not identical in upstream files. See diffstat above, or run git diff %s HEAD -- :!/debian :/ @@ -2580,9 +2580,9 @@ END if (length $wrong) { snag 'unexpected-upstream-changes', f_ "history between upstream (%s) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?", - $upstream; + $upstream_used; print STDERR f_ "list expected changes with: %s\n", - "git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'"; + "git log --stat --ancestry-path $upstream..HEAD -- :/ ':!/debian'"; } } |