#
# Resolve two trees.
#
+. git-sh-setup-script || die "Not a git archive"
+
head=$(git-rev-parse --revs-only "$1")
merge=$(git-rev-parse --revs-only "$2")
-merge_repo="$3"
-
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+merge_msg="$3"
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \
# The remote name is just used for the message,
# but we do want it.
#
-if [ -z "$head" -o -z "$merge" -o -z "$merge_repo" ]; then
- echo "git-resolve-script <head> <remote> <merge-repo-name>"
- exit 1
+if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then
+ die "git-resolve-script <head> <remote> <merge-message>"
fi
dropheads
common=$(git-merge-base $head $merge)
if [ -z "$common" ]; then
- echo "Unable to find common commit between" $merge $head
- exit 1
+ die "Unable to find common commit between" $merge $head
fi
if [ "$common" == "$merge" ]; then
fi
echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1
-merge_msg="Merge $merge_repo"
result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"
git-merge-cache -o git-merge-one-file-script -a
if [ $? -ne 0 ]; then
echo $merge > "$GIT_DIR"/MERGE_HEAD
- echo "Automatic merge failed, fix up by hand"
- exit 1
+ die "Automatic merge failed, fix up by hand"
fi
result_tree=$(git-write-tree) || exit 1
fi
projects / git.git / blobdiff