From 9a4a89c2ce5cdb6e4b22c1aeb7ce0aa3993a2c3d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 9 Feb 2018 21:51:04 +0000
Subject: [PATCH] git-debrebase: in new-upstream-v0 tolerate planned
 upstream-combine commits which are not necessary *new* upstream (eg gbp
 import)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-debrebase b/git-debrebase
index b83cceb3..b467a56d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -877,7 +877,7 @@ sub cmd_new_upstream_v0 () {
 
     if ($old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
 	if ($old_upstream->{Msg} =~
- m{^\[git-debrebase new-upstream combine \.((?: $extra_orig_namepart_re)+)\]}
+ m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
 	   ) {
 	    my @oldpieces = ('', split / /, $1);
 	    my $parentix = -1 + scalar @{ $old_upstream->{Parents} };
-- 
2.30.2