X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=52dd83bae0d6ca95cc083cd6df06a289c51558a5;hb=46b1c7c03c3ae3bf17aa87bf9ae2f9fb38d08789;hp=91b001b9a9afbcadcbacf886dd11821c2aeee1b2;hpb=c591412cc0aaf10890cdda4cf97a4fbc782d7d49;p=git.git
diff --git a/git-resolve-script b/git-resolve-script
index 91b001b9..52dd83ba 100755
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -4,15 +4,14 @@
#
# Resolve two trees.
#
-head=$(git-rev-parse --revs-only "$1")
-merge=$(git-rev-parse --revs-only "$2")
-merge_repo="$3"
+. git-sh-setup-script || die "Not a git archive"
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+head=$(git-rev-parse --verify "$1")
+merge=$(git-rev-parse --verify "$2")
+merge_msg="$3"
dropheads() {
- rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD" \
+ rm -f -- "$GIT_DIR/MERGE_HEAD" \
"$GIT_DIR/LAST_MERGE" || exit 1
}
@@ -20,9 +19,8 @@ dropheads() {
# The remote name is just used for the message,
# but we do want it.
#
-if [ -z "$head" -o -z "$merge" -o -z "$merge_repo" ]; then
- echo "git-resolve-script
"
- exit 1
+if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then
+ die "git-resolve-script "
fi
dropheads
@@ -31,8 +29,7 @@ echo $merge > "$GIT_DIR"/LAST_MERGE
common=$(git-merge-base $head $merge)
if [ -z "$common" ]; then
- echo "Unable to find common commit between" $merge $head
- exit 1
+ die "Unable to find common commit between" $merge $head
fi
if [ "$common" == "$merge" ]; then
@@ -44,21 +41,19 @@ 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
+ git-diff-tree -p $head $merge | git-apply --stat
dropheads
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 $merge > "$GIT_DIR"/MERGE_HEAD
- echo "Automatic merge failed, fix up by hand"
- exit 1
+ die "Automatic merge failed, fix up by hand"
fi
result_tree=$(git-write-tree) || exit 1
fi