diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 00:44:51 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 00:44:51 +0100 |
commit | 4f8b1a2d11988e1b793149b3c7058e50b7d96f69 (patch) | |
tree | 262edc6c750b79901b0ea9aad2444937c2723b6a /dgit | |
parent | d8d6dd2d86874c07d5238dd3112ae34ceaf41662 (diff) |
git-debrebase: Do not abandon quilt fixup at gdr split commits
One of these might well be in the delta queue somehow.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5381,7 +5381,7 @@ sub quiltify ($$$$) { print STDERR "$us: ", $reportnot->($notp), "\n"; $all_gdr &&= $notp->{Child} && (git_cat_file $notp->{Child}{Commit}, 'commit') - =~ m{^\[git-debrebase.*\]$}m; + =~ m{^\[git-debrebase(?! split[: ]).*\]$}m; } print STDERR "\n"; $failsuggestion = |