chiark / gitweb /
Split brain: Transfer gbp-pq patch application output to dgit-view branch
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 16:08:23 +0000 (17:08 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000 (16:47 +0100)
This code does not work properly yet; it will be fixed soon.

dgit

diff --git a/dgit b/dgit
index 4af8f34..a3e62c7 100755 (executable)
--- 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