diff options
Diffstat (limited to 'gitMergeCommon.py')
| -rw-r--r-- | gitMergeCommon.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitMergeCommon.py b/gitMergeCommon.py index 7e8855c617..1b5bddd467 100644 --- a/gitMergeCommon.py +++ b/gitMergeCommon.py @@ -213,7 +213,7 @@ def buildGraph(heads): # Write the empty tree to the object database and return its SHA1 def writeEmptyTree(): - tmpIndex = os.environ['GIT_DIR'] + '/merge-tmp-index' + tmpIndex = os.environ.get('GIT_DIR', '.git') + '/merge-tmp-index' def delTmpIndex(): try: os.unlink(tmpIndex) |