From 3f66e2838ad19d48fbe2a31de5ccfc1a155ce1d3 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Tue, 9 Aug 2022 08:53:48 -0700 Subject: [PATCH] GitRepository.manualmerge(): turn off rerere Turn off git-rerere when initiating a manual merge, just as we already do when automerging. --- gitimerge.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitimerge.py b/gitimerge.py index 90997ba..fed60e7 100644 --- a/gitimerge.py +++ b/gitimerge.py @@ -668,7 +668,10 @@ def automerge(self, commit1, commit2, msg=None): def manualmerge(self, commit, msg): """Initiate a merge of commit into the current HEAD.""" - check_call(['git', 'merge', '--no-commit', '-m', msg, commit,]) + check_call([ + 'git', '-c', 'rerere.enabled=false', + 'merge', '--no-commit', '-m', msg, commit, + ]) def require_clean_work_tree(self, action): """Verify that the current tree is clean.