git/git-resolve-script

#!/bin/sh
#
# Copyright (c) 2005 Linus Torvalds
#
# Resolve two trees.
#
head="$1"
merge="$2"
merge_repo="$3"

: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}

rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD
echo $head > "$GIT_DIR"/ORIG_HEAD
echo $merge > "$GIT_DIR"/MERGE_HEAD

#
# The remote name is just used for the message,
# but we do want it.
#
if [ "$merge_repo" == "" ]; then
	echo "git-resolve-script <head> <remote> <merge-repo-name>"
	exit 1
fi

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

if [ "$common" == "$merge" ]; then
	echo "Already up-to-date. Yeeah!"
	exit 0
fi
if [ "$common" == "$head" ]; then
	echo "Updating from $head to $merge."
	git-read-tree -u -m $head $merge || exit 1
	echo $merge > "$GIT_DIR"/HEAD
	git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
	exit 0
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 "Automatic merge failed, fix up by hand"
		exit 1
	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 ORIG_HEAD HEAD | git-apply --stat
Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days. 20 years ago			`#!/bin/sh`
			`#`
Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net> 20 years ago			`# Copyright (c) 2005 Linus Torvalds`
			`#`
Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days. 20 years ago			`# Resolve two trees.`
			`#`
			`head="$1"`
			`merge="$2"`
			`merge_repo="$3"`

Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net> 20 years ago			`: ${GIT_DIR=.git}`
			`: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}`

			`rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD`
			`echo $head > "$GIT_DIR"/ORIG_HEAD`
			`echo $merge > "$GIT_DIR"/MERGE_HEAD`
Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days. 20 years ago
			`#`
			`# The remote name is just used for the message,`
			`# but we do want it.`
			`#`
			`if [ "$merge_repo" == "" ]; then`
			`echo "git-resolve-script <head> <remote> <merge-repo-name>"`
			`exit 1`
			`fi`

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

			`if [ "$common" == "$merge" ]; then`
			`echo "Already up-to-date. Yeeah!"`
			`exit 0`
			`fi`
			`if [ "$common" == "$head" ]; then`
			`echo "Updating from $head to $merge."`
More work on merging with git-read-tree.. Add a "-u" flag to update the tree as a result of a merge. Right now this code is way too anal about things, and fails merges it shouldn't, but let me fix up the different cases and this will allow for much smoother merging even in the presense of dirty data in the working tree. 20 years ago			`git-read-tree -u -m $head $merge \|\| exit 1`
Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net> 20 years ago			`echo $merge > "$GIT_DIR"/HEAD`
git-resolve-script: use "git-apply --stat" instead of diffstat Not everybody necessarily even has diffstat installed. 20 years ago			`git-diff-tree -p ORIG_HEAD HEAD \| git-apply --stat`
Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days. 20 years ago			`exit 0`
			`fi`
			`echo "Trying to merge $merge into $head"`
More work on merging with git-read-tree.. Add a "-u" flag to update the tree as a result of a merge. Right now this code is way too anal about things, and fails merges it shouldn't, but let me fix up the different cases and this will allow for much smoother merging even in the presense of dirty data in the working tree. 20 years ago			`git-read-tree -u -m $common $head $merge \|\| exit 1`
Make default merge messages denser. In particular, make them readable on one line since that's what all the tools like git-shortlog and gitk end up showing. 20 years ago			`merge_msg="Merge $merge_repo"`
Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days. 20 years ago			`result_tree=$(git-write-tree 2> /dev/null)`
			`if [ $? -ne 0 ]; then`
			`echo "Simple merge failed, trying Automatic merge"`
git-resolve-script: stop when the automated merge fails No point in doing a tree write that will just throw confusing messages on the screen. 20 years ago			`git-merge-cache -o git-merge-one-file-script -a`
			`if [ $? -ne 0 ]; then`
			`echo "Automatic merge failed, fix up by hand"`
			`exit 1`
			`fi`
Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days. 20 years ago			`result_tree=$(git-write-tree) \|\| exit 1`
			`fi`
Fix git-resolve-script. I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug. 20 years ago			`result_commit=$(echo "$merge_msg" \| git-commit-tree $result_tree -p $head -p $merge)`
Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days. 20 years ago			`echo "Committed merge $result_commit"`
Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net> 20 years ago			`echo $result_commit > "$GIT_DIR"/HEAD`
git-resolve-script: use "git-apply --stat" instead of diffstat Not everybody necessarily even has diffstat installed. 20 years ago			`git-diff-tree -p ORIG_HEAD HEAD \| git-apply --stat`