diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index b83cceb..b467a56 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} }; |