mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-08-17 11:00:29 +03:00
Code Issues Projects Releases Wiki Activity

GitRepository.manualmerge(): turn off rerere

Browse Source 
Turn off git-rerere when initiating a manual merge, just as we already
do when automerging.
This commit is contained in:
Michael Haggerty 2022-08-09 08:53:48 -07:00
parent 9bde208ce9
commit 3f66e2838a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitimerge.py
View File

@ -668,7 +668,10 @@ class GitRepository(object):
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.