summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 12:46:36 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 12:46:36 +0100
commit185e64f8d95dd925adaa840595dd62af7ea88244 (patch)
treeede5ef12c8d4cf2399dcc0b0c4a3c5150cd71ee4 /git-debrebase
parent099608874f16c22a774ff9f427a8f172c84c66f9 (diff)
git-debrebase: merge: Generate some more debugging commits
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index 672551d..ef619be 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -529,6 +529,13 @@ sub merge_series ($$;@) {
}
$result = $build;
runcmd @git, qw(update-ref refs/heads/result), $result;
+
+ runcmd @git, qw(checkout -q -b debug);
+ runcmd @git, qw(commit --allow-empty -q -m M-INDEX);
+ runcmd @git, qw(add .);
+ runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
+ printdebug sprintf "merge_series done debug=%s\n",
+ git_rev_parse 'HEAD';
};
printdebug "merge_series returns $result\n";
return $result;