git-debrebase: in new-upstream-v0 tolerate planned upstream-combine commits which...

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index b83cceb365acaaa1ec253a13a506db4f1e919b40..b467a56d17a03d92706b86ee34796c7b7ffef77e 100755 (executable)
--- 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} =~
 
     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} };
           ) {
            my @oldpieces = ('', split / /, $1);
            my $parentix = -1 + scalar @{ $old_upstream->{Parents} };