summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 17:08:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:47 +0100
commit3fed6ecea1c9b312506fad419839dad94c139c0c (patch)
treea35eff6c9d7ab1d614183cbb63ae9353437cdad2 /dgit
parentda5d472747438a473f9981911996963c084aca54 (diff)
Split brain: Transfer gbp-pq patch application output to dgit-view branch
This code does not work properly yet; it will be fixed soon.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 2 insertions, 0 deletions
diff --git a/dgit b/dgit
index 4af8f34..a3e62c7 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