X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve.sh;h=fcc5ad7349e3f77a6817e499b331b262c4a07b57;hb=9f63892b3803701c97259d51143e199fe9603d3f;hp=1f559d8cb91bf88e7ddc0abad55db7ad4550aeef;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git
diff --git a/git-resolve.sh b/git-resolve.sh
index 1f559d8c..fcc5ad73 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -4,7 +4,7 @@
#
# Resolve two trees.
#
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
usage () {
die "git-resolve
"
@@ -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