summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 09:09:35 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 09:11:10 +0100
commit0d90164505d26f733fde2482616ddbf18f782145 (patch)
treea647f711f454c7ce6ac093f9e1771480f9ae2a54
parenta2adcd961613b1570dea721391e9f5c9665ba642 (diff)
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>
-rw-r--r--debian/changelog2
-rwxr-xr-xgit-debrebase1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9d22bed..be2d349 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 8385ae4..3449ec3 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);
}