diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-09-03 16:37:52 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-09-03 18:12:47 +0100 |
commit | 92547aaf083d493074b9c41649dda938efac1320 (patch) | |
tree | d2f699ac322ef1cf94a6001da983b51dc8e63233 | |
parent | 2286b68e5b63348a3e1d18b054152852801a5791 (diff) |
dgit; Pass --include-removal to dpkg-source -b
Now, with single-debian-patch, we can still handle file removals.
(This may fix other corner cases too.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 4 | ||||
-rwxr-xr-x | tests/tests/unrepresentable | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -6059,7 +6059,7 @@ sub quilt_fixup_dpkgsource_singlepatch ($$$) { rmtree("debian/patches"); - runcmd @dpkgsource, qw(-b .); + runcmd @dpkgsource, qw(--include-removal -b .); changedir ".."; runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc"); rename srcfn("$upstreamversion", "/debian/patches"), @@ -7046,7 +7046,7 @@ sub build_source { } # confess unless !!$made_split_brain == do_split_brain(); - my @cmd = (@dpkgsource, qw(-b --)); + my @cmd = (@dpkgsource, qw(-b --include-removal --)); my $leafdir; if (building_source_in_playtree()) { $leafdir = 'work'; diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable index 490b8f7..6d57989 100755 --- a/tests/tests/unrepresentable +++ b/tests/tests/unrepresentable @@ -119,15 +119,15 @@ finish EP:'creation .* symlink' 'new version is symlink' start src.c git rm src.c -finish GOOD:deleted LATE-EP:'Mode change from 644 to 000000' +finish GOOD:deleted start orig-exec git rm orig-exec -finish GOOD:'deleted exec' LATE-EP:'Mode change from 755 to 000000' +finish GOOD:'deleted exec' start orig-unwriteable git rm -f orig-unwriteable -finish GOOD:'deleted unwritable' LATE-EP:'Mode change from 644 to 000000' +finish GOOD:'deleted unwritable' start src.c chmod +x src.c |