From afa537cf736238b9618ccf0f204f17fb13324eb9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 20:11:49 +0100 Subject: [PATCH] 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 --- git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index eabf5ada..a128d92c 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"; -- 2.30.2