summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 16:44:19 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:47 +0100
commit74cca49dc0958db0556eabfbaf8bdc6d9d639701 (patch)
treee05418f6af126b55db5d5f6a791cabf7ef461b31
parent71c46788bf67bfada8c9a1e030e9093649a98c3d (diff)
Split brain: Pass $clogp to quiltify_splitbrain (nfc)
We are going to want this in a moment.
-rwxr-xr-xdgit6
1 files changed, 3 insertions, 3 deletions
diff --git a/dgit b/dgit
index 79e0cc5..29cf507 100755
--- a/dgit
+++ b/dgit
@@ -2552,8 +2552,8 @@ sub quiltify_splitbrain_needed () {
}
}
-sub quiltify_splitbrain ($) {
- my ($diffbits) = @_;
+sub quiltify_splitbrain ($$) {
+ my ($clogp, $diffbits) = @_;
if ($quilt_mode !~ m/gbp|dpm/) {
# treat .gitignore just like any other upstream file
$diffbits = { %$diffbits };
@@ -3058,7 +3058,7 @@ END
" --quilt=gbp --quilt=dpm --quilt=unapplied ?";
if ($quilt_mode =~ m/gbp|dpm|unapplied/) {
- quiltify_splitbrain($diffbits);
+ quiltify_splitbrain($clogp, $diffbits);
return;
}