git-debrebase: Rename new-upstream-v0 command to new-upstream

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 3de0aa9f1c1f62c569634e832b861e0f0dba0fc1..9e8d7075d42e32bb24a270ecaf9db217162c4ad0 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -19,6 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
+use Debian::Dgit::GDR;
 use Debian::Dgit::ExitStatus;
 
 use strict;
@@ -1018,7 +1019,7 @@ sub record_ffq_prev_deferred () {
        }
        return if $invert;
        my $lrval = git_get_ref $lrref;
-       return unless defined $lrval;
+       return unless length $lrval;
 
        if (is_fast_fwd $lrval, $currentval) {
            print "OK, you are ahead of $lrref\n" or die $!;
@@ -1128,7 +1129,7 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
-sub cmd_new_upstream_v0 () {
+sub cmd_new_upstream () {
     # automatically and unconditionally launders before rebasing
     # if rebase --abort is used, laundering has still been done