git-debrebase: convert-from-gbp: Check separately for $dtag

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index eabf5adad7f81df0236f6922b7e624192b2d40d3..42e8f7e3eec152892c35cd87666147749eea03ee 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -2477,12 +2477,14 @@ END
        my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
            $mtag_pat;
        die "could not find suitable maintainer view tag $mtag_pat\n"
-           unless $mtag_pat =~ m{/};
+           unless $mtag =~ m{/};
        is_fast_fwd $mtag, 'HEAD' or
            die "HEAD is not FF from maintainer tag $mtag!";
        my $dtag = "archive/$mtag";
+       git_get_ref "refs/tags/$dtag" or
+           die "dgit view tag $dtag not found\n";
        is_fast_fwd $mtag, $dtag or
-           die "dgit view tag $dtag is not FF from maintainer tag $mtag";
+           die "dgit view tag $dtag is not FF from maintainer tag $mtag\n";
        print "will stitch in dgit view, $dtag\n";
        git_rev_parse $dtag;
     };