From 8a4136993a9ecdfc59d502da799bec162e0135eb Mon Sep 17 00:00:00 2001
From: William Brockhus <pickeringw@gmail.com>
Date: Wed, 26 Nov 2025 14:43:56 +1100
Subject: [PATCH] fix: disable signature output when getting commit parents

fixes invalid "is an octopus merge" error when signature output is enabled in gitconfig
---
 gitimerge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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):