3 # Copyright (c) 2005 Linus Torvalds
12 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
14 rm -f "$GIT_DIR"/MERGE_HEAD
"$GIT_DIR"/ORIG_HEAD
15 echo $head > "$GIT_DIR"/ORIG_HEAD
16 echo $merge > "$GIT_DIR"/MERGE_HEAD
19 # The remote name is just used for the message,
22 if [ "$merge_repo" == "" ]; then
23 echo "git-resolve-script <head> <remote> <merge-repo-name>"
27 common
=$
(git-merge-base
$head $merge)
28 if [ -z "$common" ]; then
29 echo "Unable to find common commit between" $merge $head
33 if [ "$common" == "$merge" ]; then
34 echo "Already up-to-date. Yeeah!"
35 rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"
38 if [ "$common" == "$head" ]; then
39 echo "Updating from $head to $merge."
40 git-read-tree
-u -m $head $merge ||
exit 1
41 echo $merge > "$GIT_DIR"/HEAD
42 git-diff-tree
-p ORIG_HEAD HEAD | git-apply
--stat
43 rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"
46 echo "Trying to merge $merge into $head"
47 git-read-tree
-u -m $common $head $merge ||
exit 1
48 merge_msg
="Merge $merge_repo"
49 result_tree
=$
(git-write-tree
2> /dev
/null
)
51 echo "Simple merge failed, trying Automatic merge"
52 git-merge-cache
-o git-merge-one-file-script
-a
54 echo "Automatic merge failed, fix up by hand"
57 result_tree
=$
(git-write-tree
) ||
exit 1
59 result_commit
=$
(echo "$merge_msg" | git-commit-tree
$result_tree -p $head -p $merge)
60 echo "Committed merge $result_commit"
61 echo $result_commit > "$GIT_DIR"/HEAD
62 git-diff-tree
-p $head $result_commit | git-apply
--stat
63 rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"