[thirdparty/git.git] / git-resolve-script

#!/bin/sh
#
# Copyright (c) 2005 Linus Torvalds
#
# Resolve two trees.
#
. git-sh-setup-script || die "Not a git archive"

usage () {
	die "git-resolve-script <head> <remote> <merge-message>"
}

dropheads() {
	rm -f -- "$GIT_DIR/MERGE_HEAD" \
		"$GIT_DIR/LAST_MERGE" || exit 1
}

head=$(git-rev-parse --verify "$1"^0) &&
merge=$(git-rev-parse --verify "$2"^0) &&
merge_msg="$3" || usage

#
# The remote name is just used for the message,
# but we do want it.
#
if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then
	usage
fi

dropheads
echo $head > "$GIT_DIR"/ORIG_HEAD
echo $merge > "$GIT_DIR"/LAST_MERGE

common=$(git-merge-base $head $merge)
if [ -z "$common" ]; then
	die "Unable to find common commit between" $merge $head
fi

case "$common" in
"$merge")
	echo "Already up-to-date. Yeeah!"
	dropheads
	exit 0
	;;
"$head")
	echo "Updating from $head to $merge."
	git-read-tree -u -m $head $merge || exit 1
	echo $merge > "$GIT_DIR"/HEAD
	git-diff-tree -p $head $merge | git-apply --stat
	dropheads
	exit 0
	;;
esac

# Find an optimum merge base if there are more than one candidates.
LF='
'
common=$(git-merge-base -a $head $merge)
case "$common" in
?*"$LF"?*)
	echo "Trying to find the optimum merge base."
	G=.tmp-index$$
	best=
	best_cnt=-1
	for c in $common
	do
		rm -f $G
		GIT_INDEX_FILE=$G git-read-tree -m $c $head $merge \
			2>/dev/null || continue
		# Count the paths that are unmerged.
		cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l`
		if test $best_cnt -le 0 -o $cnt -le $best_cnt
		then
			best=$c
			best_cnt=$cnt
			if test "$best_cnt" -eq 0
			then
				# Cannot do any better than all trivial merge.
				break
			fi
		fi
	done
	rm -f $G
	common="$best"
esac

echo "Trying to merge $merge into $head using $common."
git-update-cache --refresh 2>/dev/null
git-read-tree -u -m $common $head $merge || exit 1
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
		die "Automatic merge failed, fix up by hand"
	fi
	result_tree=$(git-write-tree) || exit 1
fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
echo "Committed merge $result_commit"
echo $result_commit > "$GIT_DIR"/HEAD
git-diff-tree -p $head $result_commit | git-apply --stat
dropheads
Commit	Line	Data
67cc5c4e LT	1	#!/bin/sh
67cc5c4e LT	2	#
8ac069ac JH	3	# Copyright (c) 2005 Linus Torvalds
8ac069ac JH	4	#
67cc5c4e LT	5	# Resolve two trees.
67cc5c4e LT	6	#
b33e9666 LT	7	. git-sh-setup-script \|\| die "Not a git archive"
b33e9666 LT	8
165e160e JH	9	usage () {
	10	die "git-resolve-script <head> <remote> <merge-message>"
	11	}
67cc5c4e	12
c591412c	13	dropheads() {
6b38a402	14	rm -f -- "$GIT_DIR/MERGE_HEAD" \
c591412c DH	15	"$GIT_DIR/LAST_MERGE" \|\| exit 1
c591412c DH	16	}
67cc5c4e	17
165e160e JH	18	head=$(git-rev-parse --verify "$1"^0) &&
	19	merge=$(git-rev-parse --verify "$2"^0) &&
	20	merge_msg="$3" \|\| usage
	21
67cc5c4e LT	22	#
	23	# The remote name is just used for the message,
	24	# but we do want it.
	25	#
3ba513c3	26	if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then
165e160e	27	usage
67cc5c4e LT	28	fi
67cc5c4e LT	29
c591412c DH	30	dropheads
	31	echo $head > "$GIT_DIR"/ORIG_HEAD
	32	echo $merge > "$GIT_DIR"/LAST_MERGE
	33
67cc5c4e LT	34	common=$(git-merge-base $head $merge)
67cc5c4e LT	35	if [ -z "$common" ]; then
b33e9666	36	die "Unable to find common commit between" $merge $head
67cc5c4e LT	37	fi
67cc5c4e LT	38
86b13da4 JH	39	case "$common" in
86b13da4 JH	40	"$merge")
67cc5c4e	41	echo "Already up-to-date. Yeeah!"
c591412c	42	dropheads
67cc5c4e	43	exit 0
86b13da4 JH	44	;;
86b13da4 JH	45	"$head")
67cc5c4e	46	echo "Updating from $head to $merge."
220a0b52	47	git-read-tree -u -m $head $merge \|\| exit 1
8ac069ac	48	echo $merge > "$GIT_DIR"/HEAD
6b38a402	49	git-diff-tree -p $head $merge \| git-apply --stat
c591412c	50	dropheads
67cc5c4e	51	exit 0
86b13da4 JH	52	;;
86b13da4 JH	53	esac
9585e406 JH	54
	55	# Find an optimum merge base if there are more than one candidates.
	56	LF='
	57	'
	58	common=$(git-merge-base -a $head $merge)
	59	case "$common" in
	60	?"$LF"?)
	61	echo "Trying to find the optimum merge base."
	62	G=.tmp-index$$
	63	best=
	64	best_cnt=-1
	65	for c in $common
	66	do
	67	rm -f $G
	68	GIT_INDEX_FILE=$G git-read-tree -m $c $head $merge \
	69	2>/dev/null \|\| continue
	70	# Count the paths that are unmerged.
	71	cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged \| wc -l`
	72	if test $best_cnt -le 0 -o $cnt -le $best_cnt
	73	then
	74	best=$c
	75	best_cnt=$cnt
	76	if test "$best_cnt" -eq 0
	77	then
	78	# Cannot do any better than all trivial merge.
	79	break
	80	fi
	81	fi
	82	done
	83	rm -f $G
	84	common="$best"
	85	esac
	86
	87	echo "Trying to merge $merge into $head using $common."
	88	git-update-cache --refresh 2>/dev/null
220a0b52	89	git-read-tree -u -m $common $head $merge \|\| exit 1
67cc5c4e LT	90	result_tree=$(git-write-tree 2> /dev/null)
	91	if [ $? -ne 0 ]; then
	92	echo "Simple merge failed, trying Automatic merge"
e5b905c4 LT	93	git-merge-cache -o git-merge-one-file-script -a
e5b905c4 LT	94	if [ $? -ne 0 ]; then
c591412c	95	echo $merge > "$GIT_DIR"/MERGE_HEAD
b33e9666	96	die "Automatic merge failed, fix up by hand"
e5b905c4	97	fi
67cc5c4e LT	98	result_tree=$(git-write-tree) \|\| exit 1
67cc5c4e LT	99	fi
d5a72fd6	100	result_commit=$(echo "$merge_msg" \| git-commit-tree $result_tree -p $head -p $merge)
67cc5c4e	101	echo "Committed merge $result_commit"
8ac069ac	102	echo $result_commit > "$GIT_DIR"/HEAD
9c065315	103	git-diff-tree -p $head $result_commit \| git-apply --stat
c591412c	104	dropheads