diff --git a/gitimerge.py b/gitimerge.py index 90997ba..6fd2716 100644 --- a/gitimerge.py +++ b/gitimerge.py @@ -845,7 +845,7 @@ def get_commit_parents(self, commit): """Return a list containing the parents of commit.""" return check_output( - ['git', '--no-pager', 'log', '--no-walk', '--pretty=format:%P', commit] + ['git', '-c', 'log.showSignature=false', '--no-pager', 'log', '--no-walk', '--pretty=format:%P', commit] ).strip().split() def get_tree(self, arg):