From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 1 Mar 2019 18:36:50 +0000 (+0000)
Subject: git-debrebase: convert-*: Fix two broken error messages
X-Git-Tag: archive/debian/8.4~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6123e69cb8bc61f112d455ca8df5b6c68fa7e6f6;p=dgit.git

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>
---

diff --git a/git-debrebase b/git-debrebase
index 20e5728e..efb0cea4 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'";
 	}
     }