diff --git a/HaikuPorter/Source.py b/HaikuPorter/Source.py index 72113942..c31a7a03 100644 --- a/HaikuPorter/Source.py +++ b/HaikuPorter/Source.py @@ -433,9 +433,9 @@ def extractPatchset(self, patchSetFilePath, archPatchSetFilePath): if not os.path.exists(patchSetDirectory): os.mkdir(patchSetDirectory) with open(patchSetFilePath, 'w') as patchSetFile: - check_call(['git', 'format-patch', '-kp', '--stdout', 'ORIGIN'], - stdout=patchSetFile, cwd=self.sourceDir, - env=self.gitEnv) + check_call(['git', '-c', 'core.abbrev=auto', 'format-patch', '-kp', + '--stdout', 'ORIGIN'], stdout=patchSetFile, + cwd=self.sourceDir, env=self.gitEnv) if needToRebase: # put PATCH_FUNCTION back in