git-debrebase: merge: Use a fresh branch and check out again

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 3ac087c980034a3a4812b97ec6d8a5b21c4b1e07..18bc21f0dbb965b48f4aebc4c8a07d7e67e4ba3e 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -391,6 +391,9 @@ sub merge_failed ($$;@) {
 
     my @updates;
     merge_wreckage_cleaning \@updates;
+    run_ref_updates_now "merge failed", \@updates;
+
+    @updates = ();
     keys %$wrecknotes;
     while (my ($k,$v) = each %$wrecknotes) {
        push @updates, "create $wrecknoteprefix/$k $v";
@@ -414,6 +417,17 @@ sub mwrecknote ($$$) {
     $wrecknotes->{$reftail} = $commitish;
 }
 
+sub merge_attempt_cmd {
+    my $wrecknotes = shift @_;
+    debugcmd '+', @_;
+    $!=0; $?=-1;
+    if (system @_) {
+       merge_failed $wrecknotes,
+           failedcmd_waitstatus(),
+           "failed command: @_";
+    }
+}
+
 sub merge_series ($$$;@) {
     my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
     # $base_q{SeriesBase}  $input_qs[]{SeriesBase}
@@ -439,18 +453,11 @@ sub merge_series ($$$;@) {
     # $prereq{<patch filename>}               exists or not (even later)
 
     my $result;
+    my $merged_pq;
 
     my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
 
-    my $attempt_cmd = sub {
-       debugcmd '+', @_;
-       $!=0; $?=-1;
-       if (system @_) {
-           merge_failed $wrecknotes,
-               failedcmd_waitstatus(),
-               "failed command: @_";
-       }
-    };
+    my $attempt_cmd = sub { &merge_attempt_cmd($wrecknotes, @_); };
 
     local $workarea;
     fresh_workarea "merge";
@@ -586,18 +593,20 @@ sub merge_series ($$$;@) {
 
        runcmd @git, qw(add), $seriesfile;
        runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
-       $mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
+       $merged_pq = git_rev_parse 'HEAD';
+       $mwrecknote->('merged-patchqueue', $merged_pq);
 
        printdebug "merge_series series gbp pq import\n";
+       runcmd @git, qw(checkout -q -b mergec), $merged_pq;
 
-       $attempt_cmd->(qw(gbp pq import));
+       merge_attempt_cmd($wrecknotes, qw(gbp pq import));
 
        # OK now we are on patch-queue/merge, and we need to rebase
        # onto the intended parent and drop the patches from each one
 
        printdebug "merge_series series ok, building...\n";
        my $build = $newbase;
-       my @lcmd = (@git, qw(rev-list --reverse merge..patch-queue/merge));
+       my @lcmd = (@git, qw(rev-list --reverse mergec..patch-queue/mergec));
        foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) {
            my $commit = git_cat_file $c, 'commit';
            printdebug "merge_series series ok, building $c\n";
@@ -611,7 +620,7 @@ sub merge_series ($$$;@) {
            $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
        }
        $result = $build;
-       $mwrecknote->('merged-result', $result);
+       mwrecknote($wrecknotes, 'merged-result', $result);
 
        runcmd @git, qw(update-ref refs/heads/result), $result;
 
@@ -621,7 +630,7 @@ sub merge_series ($$$;@) {
        runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
        my $mdebug = git_rev_parse 'HEAD';
        printdebug sprintf "merge_series done debug=%s\n", $mdebug;
-       $mwrecknote->('merged-debug', $mdebug);
+       mwrecknote($wrecknotes, 'merged-debug', $mdebug);
     };
     printdebug "merge_series returns $result\n";
     return $result;