X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=fffcb07df3d020592c79de189ea2d762b0df7232;hb=52f28529f4f90cebdca47f8eacbff5cb20004bed;hp=bf2fb2d431da4702cd2b5fe3f414ce22c7ab284d;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git
diff --git a/git-resolve-script b/git-resolve-script
index bf2fb2d4..fffcb07d 100755
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -4,12 +4,11 @@
#
# Resolve two trees.
#
+. git-sh-setup-script || die "Not a git archive"
+
head=$(git-rev-parse --revs-only "$1")
merge=$(git-rev-parse --revs-only "$2")
-merge_repo="$3"
-
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+merge_msg="$3"
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \
@@ -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
@@ -50,15 +47,13 @@ if [ "$common" == "$head" ]; then
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