git-debrebase: record_ffq_prev_deferred: Move get_head();

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 557e7898a1cd8fa11771982a2f9717177000a7a7..ddb7840cf997236d4d604c6468f84923209a2e53 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -270,7 +270,7 @@ sub snags_maybe_bail () {
                $us, $snags_tripped;
        } else {
            fail sprintf
-  "%s: snags: %d blockers (you could -f<tag>, or --force)",
+  "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
                $us, $snags_tripped;
        }
     }
@@ -992,12 +992,12 @@ sub record_ffq_prev_deferred () {
     # if "deferred", will have added something about that to
     #   @deferred_update_messages, and also maybe printed (already)
     #   some messages about ff checks
+    my $currentval = get_head();
+
     my ($status, $message, $current, $ffq_prev, $gdrlast)
        = ffq_prev_branchinfo();
     return ($status, $message) unless $status eq 'branch';
 
-    my $currentval = get_head();
-
     my $exists = git_get_ref $ffq_prev;
     return ('exists',"$ffq_prev already exists") if $exists;
 
@@ -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;