From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Jul 2018 08:09:35 +0000 (+0100)
Subject: git-debrebase: new-upstream: Fix error message for new version with bad syntax
X-Git-Tag: archive/debian/6.3~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0d90164505d26f733fde2482616ddbf18f782145

git-debrebase: new-upstream: Fix error message for new version with bad syntax

Calling
  new Dpkg::Version , check => 1
does not die or anything if it's wrong; it just returns undef.

The result is an error message about calling is_valid on an undefined
value.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 9d22bed9..be2d3495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (6.3~) unstable; urgency=medium
 
   * git-debrebase: breakwater: Fix error message for unprocessable
     commits.  Closes:#905003.
+  * git-debrebase: new-upstream: Fix error message for new version
+    with bad syntax.
 
  --
 
diff --git a/git-debrebase b/git-debrebase
index 8385ae48..3449ec39 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1173,6 +1173,7 @@ sub cmd_new_upstream () {
     # parse args - low commitment
     my $spec_version = shift @ARGV;
     my $new_version = (new Dpkg::Version $spec_version, check => 1);
+    fail "bad version number \`$spec_version'" unless defined $new_version;
     if ($new_version->is_native()) {
 	$new_version = (new Dpkg::Version "$spec_version-1", check => 1);
     }