X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve.sh;h=7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316;hb=1301c6eb412e7c5511b952a12e42c70ad56f028b;hp=1f559d8cb91bf88e7ddc0abad55db7ad4550aeef;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git

diff --git a/git-resolve.sh b/git-resolve.sh
index 1f559d8c..7d8fb54f 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -45,7 +45,7 @@ case "$common" in
 "$head")
 	echo "Updating from $head to $merge."
 	git-read-tree -u -m $head $merge || exit 1
-	echo $merge > "$GIT_DIR"/HEAD
+	git-update-ref HEAD "$merge" "$head"
 	git-diff-tree -p $head $merge | git-apply --stat
 	dropheads
 	exit 0
@@ -99,6 +99,6 @@ if [ $? -ne 0 ]; then
 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-update-ref HEAD "$result_commit" "$head"
 git-diff-tree -p $head $result_commit | git-apply --stat
 dropheads