From 74cca49dc0958db0556eabfbaf8bdc6d9d639701 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 16:44:19 +0100
Subject: [PATCH 1/1] Split brain: Pass $clogp to quiltify_splitbrain (nfc)

We are going to want this in a moment.
---
 dgit | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dgit b/dgit
index 79e0cc53..29cf5076 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;
     }
 
-- 
2.30.2