diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2005-10-03 08:13:09 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-10-03 00:25:42 -0700 |
| commit | 88f8f0a52b2962452d89e854ad751283595473e4 (patch) | |
| tree | 1167cf32d0708a77bed51a0bcc08334f282ab756 /gitMergeCommon.py | |
| parent | Make sure get_sha1 does not accept ambiguous sha1 prefix. (diff) | |
| download | tgif-88f8f0a52b2962452d89e854ad751283595473e4.tar.xz | |
[PATCH] Enable and fix support for base less merges.
Let the merge strategies handle the base less case if they are able to
do it. It also fixes git-resolve.sh to die if no common ancestors
exists, instead of doing the wrong thing. Furthermore, it contains a
small independent fix for git-merge.sh and a fix for a base less code
path in gitMergeCommon.py.
With this it's possible to use
git merge -s recursive 'merge message' A B
to do a base less merge of A and B.
[jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge.
I fixed a small typo in git-merge-resolve fix; 'test' equality
check is spelled with single equal sign -- C-style double equal
sign is bashism.]
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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) |