X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=gitMergeCommon.py;h=1b5bddd467c3d2265e8204bb90c80a2c53742b4a;hb=af2d3aa4d84fd3475d9b676f669eab3c4227189f;hp=7e8855c617ac3391a698e61023d9ca465b4b295e;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 7e8855c6..1b5bddd4 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)