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 9d22bed97e84143837120a3c4c848f1ed2f73586..be2d3495ddecec9beb649889c3dbf8afc2d90899 100644 (file)
--- 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: 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 8385ae48650cc9df7fd68bec282cc2732d840339..3449ec3950ad98064baf6b0736455dfa76c456f9 100755 (executable)
--- 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);
     # 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);
     }
     if ($new_version->is_native()) {
        $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
     }