summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 20:11:49 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 21:00:31 +0100
commitafa537cf736238b9618ccf0f204f17fb13324eb9 (patch)
tree1773a1a37b985fd1499de635a73f3b9337c46b23
parentc8cdfbd7dbe5f8ec6f9e01094aa3f21d64111408 (diff)
git-debrebase: convert-from-gbp: handle missing maintainer tag
Look for / in $mtag, not in $mtag_pat. Obviously it will be in the latter. The result, before, is that we would look for a completely bogus $dtag and print daft error messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index eabf5ad..a128d92 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2477,7 +2477,7 @@ 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";