summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-10-03 08:13:09 +0200
committerJunio C Hamano <junkio@cox.net>2005-10-03 00:25:42 -0700
commit88f8f0a52b2962452d89e854ad751283595473e4 (patch)
tree1167cf32d0708a77bed51a0bcc08334f282ab756 /git-merge-resolve.sh
parent99a19b43021024e12ddb67831f8e5919f86a5979 (diff)
downloadgit-88f8f0a52b2962452d89e854ad751283595473e4.tar.gz
[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 'git-merge-resolve.sh')
-rwxr-xr-xgit-merge-resolve.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index e3b04a0e95..966e81ff7d 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -31,6 +31,12 @@ case "$remotes" in
exit 2 ;;
esac
+# Give up if this is a baseless merge.
+if test '' = "$bases"
+then
+ exit 2
+fi
+
git-update-index --refresh 2>/dev/null
git-read-tree -u -m $bases $head $remotes || exit 2
echo "Trying simple merge."