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

diff --git a/git-tag-script b/git-tag-script
index 233491bc633aaa21337bfb5ba1b01369d0ea6d89..281d192814ec200199379f44fef10d2b04f762c1 100755 (executable)
--- a/git-tag-script
+++ b/git-tag-script
@@ -1,6 +1,10 @@
 #!/bin/sh
-object=${2:-$(cat .git/HEAD)}
-type=$(cat-file -t $object) || exit 1
+# Copyright (c) 2005 Linus Torvalds
+
+: ${GIT_DIR=.git}
+
+object=${2:-$(cat "$GIT_DIR"/HEAD)}
+type=$(git-cat-file -t $object) || exit 1
 ( echo -e "object $object\ntype $type\ntag $1\n"; cat ) > .tmp-tag
 rm -f .tmp-tag.asc
 gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag