diff options
| author | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 16:42:45 -0700 |
|---|---|---|
| committer | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 16:42:45 -0700 |
| commit | b23f02ee7aa3fc1cdaf6aebde9b731f22671251b (patch) | |
| tree | 0bb59f24e42da48d729f94fb5cc6efdbf2a33129 /gitMergeCommon.py | |
| parent | c8c5b21a3714db3272f869c82f3ce862ed9c2cc6 (diff) | |
| parent | 17222001273b817aa9655744a0033619134b1a2c (diff) | |
| download | git-b23f02ee7aa3fc1cdaf6aebde9b731f22671251b.tar.gz | |
Merge with master.kernel.org:/pub/scm/git/git.git
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) |