chiark / gitweb /
Split brain: Pass $clogp to quiltify_splitbrain (nfc)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 15:44:19 +0000 (16:44 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000 (16:47 +0100)
We are going to want this in a moment.

dgit

diff --git a/dgit b/dgit
index 79e0cc5..29cf507 100755 (executable)
--- 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;
     }