git-tar-tree: no more void pointer arithmetic

[git.git] / git-resolve.sh
diff --git a/git-resolve.sh b/git-resolve.sh

index 1f559d8..1c7aaef 100755 (executable)
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -4,11 +4,9 @@
  #
  # Resolve two trees.
  #
-. git-sh-setup || die "Not a git archive"
  
-usage () {
-       die "git-resolve <head> <remote> <merge-message>"
-}
+USAGE='<head> <remote> <merge-message>'
+. git-sh-setup
  
  dropheads() {
         rm -f -- "$GIT_DIR/MERGE_HEAD" \
@@ -43,15 +41,18 @@ case "$common" in
         exit 0
         ;;
  "$head")
-       echo "Updating from $head to $merge."
+       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
         ;;
  esac
  
+# We are going to make a new commit.
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
  # Find an optimum merge base if there are more than one candidates.
  LF='
  '
@@ -99,6 +100,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