From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Nov 2015 17:40:53 +0000 (+0000)
Subject: Split brain: Actually get gbp pq output back onto dgit-view branch
X-Git-Tag: archive/debian/2.0~300
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b6bfd8006f64dd4743a4eb583321dbd59eb45980

Split brain: Actually get gbp pq output back onto dgit-view branch

And explain why in a comment.
---

diff --git a/dgit b/dgit
index a3e62c71..0812f32a 100755
--- a/dgit
+++ b/dgit
@@ -2575,7 +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);
+	# gbp-pq import creates a fresh branch; push back to dgit-view
+	runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
 	runcmd @git, qw(checkout dgit-view);
     }
     if (($diffbits->{H2O} & 02) && # user has modified .gitignore