summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-11-28 17:40:53 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:47 +0100
commitb6bfd8006f64dd4743a4eb583321dbd59eb45980 (patch)
tree1fcffe0fdff39839075a4912a4a9676d95c4ecd0 /dgit
parent3fed6ecea1c9b312506fad419839dad94c139c0c (diff)
Split brain: Actually get gbp pq output back onto dgit-view branch
And explain why in a comment.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit3
1 files changed, 2 insertions, 1 deletions
diff --git a/dgit b/dgit
index a3e62c7..0812f32 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