diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-09 21:51:04 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | 9a4a89c2ce5cdb6e4b22c1aeb7ce0aa3993a2c3d (patch) | |
| tree | 539d42e0bd6b8189aa5ca304da83c8013a855198 | |
| parent | c8ff64a45b1fbc8484c19b16df0adc3f39150a51 (diff) | |
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>
| -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} }; |