diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-21 00:32:34 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-21 01:11:11 +0100 |
commit | 630bf678ac46457cb33f8f15ab4cdeed3c64ebe1 (patch) | |
tree | 63c12bb0c81a2ebe07192c27525e191584a2e814 /dgit | |
parent | ae3881653a4639a9c3017ffdb187b49ebe9fcea3 (diff) |
dgit: quiltify_splitbrain: Pass $oldtiptree (o+d/p) too
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5062,8 +5062,8 @@ sub quiltify_splitbrain_needed () { } } -sub quiltify_splitbrain ($$$$$$) { - my ($clogp, $unapplied, $headref, $diffbits, +sub quiltify_splitbrain ($$$$$$$) { + my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits, $editedignores, $cachekey) = @_; if ($quilt_mode !~ m/gbp|dpm/) { # treat .gitignore just like any other upstream file @@ -5876,7 +5876,7 @@ END " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"; if (quiltmode_splitbrain()) { - quiltify_splitbrain($clogp, $unapplied, $headref, + quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree, $diffbits, \%editedignores, $splitbrain_cachekey); return; |