3 # Copyright (c) 2005 Linus Torvalds
7 . git-sh-setup-script || die "Not a git archive"
10 die "git-resolve-script <head> <remote> <merge-message>"
14 rm -f -- "$GIT_DIR/MERGE_HEAD" \
15 "$GIT_DIR/LAST_MERGE" || exit 1
18 head=$(git-rev-parse --verify "$1"^0) &&
19 merge=$(git-rev-parse --verify "$2"^0) &&
20 merge_msg="$3" || usage
23 # The remote name is just used for the message,
26 if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then
31 echo $head > "$GIT_DIR"/ORIG_HEAD
32 echo $merge > "$GIT_DIR"/LAST_MERGE
34 common=$(git-merge-base $head $merge)
35 if [ -z "$common" ]; then
36 die "Unable to find common commit between" $merge $head
39 if [ "$common" == "$merge" ]; then
40 echo "Already up-to-date. Yeeah!"
44 if [ "$common" == "$head" ]; then
45 echo "Updating from $head to $merge."
46 git-read-tree -u -m $head $merge || exit 1
47 echo $merge > "$GIT_DIR"/HEAD
48 git-diff-tree -p $head $merge | git-apply --stat
52 echo "Trying to merge $merge into $head"
53 git-read-tree -u -m $common $head $merge || exit 1
54 result_tree=$(git-write-tree 2> /dev/null)
56 echo "Simple merge failed, trying Automatic merge"
57 git-merge-cache -o git-merge-one-file-script -a
59 echo $merge > "$GIT_DIR"/MERGE_HEAD
60 die "Automatic merge failed, fix up by hand"
62 result_tree=$(git-write-tree) || exit 1
64 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
65 echo "Committed merge $result_commit"
66 echo $result_commit > "$GIT_DIR"/HEAD
67 git-diff-tree -p $head $result_commit | git-apply --stat