X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve-script;h=52dd83bae0d6ca95cc083cd6df06a289c51558a5;hb=e468305a954d95a26bfcdec3bc6e4bd477d95676;hp=0b04a5f6af8b97065cfe812509f2d96a600825ab;hpb=9c065315f70fb1086ef16fc37e72e3edbaf3e919;p=git.git
diff --git a/git-resolve-script b/git-resolve-script
old mode 100644
new mode 100755
index 0b04a5f6..52dd83ba
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -4,53 +4,56 @@
#
# Resolve two trees.
#
-head="$1"
-merge="$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"
-rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD
-echo $head > "$GIT_DIR"/ORIG_HEAD
-echo $merge > "$GIT_DIR"/MERGE_HEAD
+dropheads() {
+ rm -f -- "$GIT_DIR/MERGE_HEAD" \
+ "$GIT_DIR/LAST_MERGE" || exit 1
+}
#
# The remote name is just used for the message,
# but we do want it.
#
-if [ "$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
+echo $head > "$GIT_DIR"/ORIG_HEAD
+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
echo "Already up-to-date. Yeeah!"
+ dropheads
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
+ 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 "Automatic merge failed, fix up by hand"
- exit 1
+ echo $merge > "$GIT_DIR"/MERGE_HEAD
+ die "Automatic merge failed, fix up by hand"
fi
result_tree=$(git-write-tree) || exit 1
fi
@@ -58,4 +61,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me
echo "Committed merge $result_commit"
echo $result_commit > "$GIT_DIR"/HEAD
git-diff-tree -p $head $result_commit | git-apply --stat
-rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD
+dropheads