git-read-tree: fix up two-way merge

diff --git a/git-commit-script b/git-commit-script
index f8d568ce88ff1e372b94c6dbfaeded149dcf103f..e818d0a35ce2a9f5358520b7c44dfe27845de4b7 100755 (executable)
--- a/git-commit-script
+++ b/git-commit-script
@@ -5,11 +5,9 @@ then
        cat .editmsg
        exit 1
 fi
-ED=${VISUAL:$EDITOR}
-ED=${ED:vi}
-$ED .editmsg
+${VISUAL:-${EDITOR:-vi}} .editmsg
 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
 [ -s .cmitmsg ] || exit 1
 tree=$(git-write-tree) || exit 1
 commit=$(cat .cmitmsg | git-commit-tree $tree -p HEAD) || exit 1
-echo $commit > .git/HEAD
+echo $commit > ${GIT_DIR:-.git}/HEAD