X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=b467a56d17a03d92706b86ee34796c7b7ffef77e;hp=b83cceb365acaaa1ec253a13a506db4f1e919b40;hb=9a4a89c2ce5cdb6e4b22c1aeb7ce0aa3993a2c3d;hpb=c8ff64a45b1fbc8484c19b16df0adc3f39150a51

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} };