summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-07 00:41:56 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-07 00:42:27 +0100
commit180a9c094c1b1e51281c70940dc451465ec04806 (patch)
tree5e1caa5ef01af48c2cc3a916d3d2cf7c85eec46d /git-debrebase
parent87da76cc34151e4623797b32d16c351029969bb6 (diff)
git-debrebase new-upstream: Add a -1 revision if the user didn't supply one.
Closes:#903127. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 557e789..c28a775 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1140,7 +1140,11 @@ sub cmd_new_upstream () {
badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
# parse args - low commitment
- my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
+ my $spec_version = shift @ARGV;
+ my $new_version = (new Dpkg::Version $spec_version, check => 1);
+ if ($new_version->is_native()) {
+ $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
+ }
my $new_upstream_version = $new_version->version();
my $new_upstream = shift @ARGV;