From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 16:08:23 +0000 (+0100)
Subject: Split brain: Transfer gbp-pq patch application output to dgit-view branch
X-Git-Tag: archive/debian/2.0~301
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3fed6ecea1c9b312506fad419839dad94c139c0c;p=dgit.git

Split brain: Transfer gbp-pq patch application output to dgit-view branch

This code does not work properly yet; it will be fixed soon.
---

diff --git a/dgit b/dgit
index 4af8f34c..a3e62c71 100755
--- a/dgit
+++ b/dgit
@@ -2575,6 +2575,8 @@ sub quiltify_splitbrain ($$$$$) {
 	progress "creating patches-applied version using gbp-pq";
 	open STDOUT, ">/dev/null" or die $!;
 	runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
+	runcmd @git, qw(update-ref dgit-view HEAD);
+	runcmd @git, qw(checkout dgit-view);
     }
     if (($diffbits->{H2O} & 02) && # user has modified .gitignore
 	!($diffbits->{O2A} & 02)) { # patches do not change .gitignore