From bf7960eb51a26bcf52f27a60bfcf005661266b1e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 27 Sep 2005 18:14:27 -0700 Subject: Use git-update-ref in scripts. This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano --- git-resolve.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-resolve.sh') diff --git a/git-resolve.sh b/git-resolve.sh index 1f559d8cb9..7d8fb54f95 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 -- cgit v1.3