From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 11:46:36 +0000 (+0100)
Subject: git-debrebase: merge: Generate some more debugging commits
X-Git-Tag: archive/debian/6.7~128
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=185e64f8d95dd925adaa840595dd62af7ea88244

git-debrebase: merge: Generate some more debugging commits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 672551d5..ef619be4 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;