diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-10 12:58:50 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-11 00:58:08 +0100 |
commit | 0d948b7ca6205272838569aeeb3b5bb83f1b8f09 (patch) | |
tree | bd0b74f0e351f89c225fc6a53f8ddf735026cf4c /dgit | |
parent | c5ea431df91d0deca75840e3189f8ac316e52280 (diff) |
dgit: quilt linearisation: Stop at debian/source/format changes
Traversing a change of source format will not end well.
Discovered this possibility while investigating #910687.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -5503,7 +5503,8 @@ sub quiltify ($$$$) { printdebug "considering C=$c->{Commit} P=$p->{Commit}\n"; my @cmd= (@git, qw(diff-tree -r --name-only), - $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc)); + $p->{Commit},$c->{Commit}, + qw(-- debian/patches .pc debian/source/format)); my $patchstackchange = cmdoutput @cmd; if (length $patchstackchange) { $patchstackchange =~ s/\n/,/g; |