1#!/bin/sh
2#
3# Copyright (c) 2005 Linus Torvalds
4#
5# Resolve two trees.
6#
7head="$1"
8merge="$2"
9merge_repo="$3"
10
11: ${GIT_DIR=.git}
12: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
13
14rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD
15echo $head > "$GIT_DIR"/ORIG_HEAD
16echo $merge > "$GIT_DIR"/MERGE_HEAD
17
18#
19# The remote name is just used for the message,
20# but we do want it.
21#
22if [ "$merge_repo" == "" ]; then
23 echo "git-resolve-script <head> <remote> <merge-repo-name>"
24 exit 1
25fi
26
27common=$(git-merge-base $head $merge)
28if [ -z "$common" ]; then
29 echo "Unable to find common commit between" $merge $head
30 exit 1
31fi
32
33if [ "$common" == "$merge" ]; then
34 echo "Already up-to-date. Yeeah!"
35 exit 0
36fi
37if [ "$common" == "$head" ]; then
38 echo "Updating from $head to $merge."
39 echo "Destroying all noncommitted data!"
40 echo "Kill me within 3 seconds.."
41 sleep 3
42 git-read-tree -m $merge && git-checkout-cache -f -u -a
43 echo $merge > "$GIT_DIR"/HEAD
44 git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
45 exit 0
46fi
47echo "Trying to merge $merge into $head"
48git-read-tree -m $common $head $merge
49merge_msg="Merge of $merge_repo"
50result_tree=$(git-write-tree 2> /dev/null)
51if [ $? -ne 0 ]; then
52 echo "Simple merge failed, trying Automatic merge"
53 git-merge-cache git-merge-one-file-script -a
54 merge_msg="Automatic merge of $merge_repo"
55 result_tree=$(git-write-tree) || exit 1
56fi
57result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
58echo "Committed merge $result_commit"
59echo $result_commit > "$GIT_DIR"/HEAD
60git-checkout-cache -f -u -a
61git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1