summaryrefslogtreecommitdiff
path: root/git-tag.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-03 23:26:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-04 07:05:49 (GMT)
commita10aad6a9a37fbafcda590a00ddaf7b2bfda940e (patch)
treea469bc3e7efcb96db78bbffcdabcbea01bead34d /git-tag.sh
parent50496b2170cbe87b4c13f89f274aa2f181522bb9 (diff)
downloadgit-a10aad6a9a37fbafcda590a00ddaf7b2bfda940e.zip
git-a10aad6a9a37fbafcda590a00ddaf7b2bfda940e.tar.gz
git-a10aad6a9a37fbafcda590a00ddaf7b2bfda940e.tar.bz2
git-tag: Do not assume the working tree root is writable.
This is a long overdue companion commit that fixed git-commit (Santi's f8e2c54c9a17af3319e96db1d9e97ace36ae6831). Having the temporary files in the working tree root when making tags is not as bad because it does not involve 'git status' as the git-commit case, but this makes things more consistent. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-tag.sh')
-rwxr-xr-xgit-tag.sh24
1 files changed, 13 insertions, 11 deletions
diff --git a/git-tag.sh b/git-tag.sh
index faa7667..bd92753 100755
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -61,33 +61,35 @@ type=$(git-cat-file -t $object) || exit 1
tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
: ${username:=$(expr "$tagger" : '\(.*>\)')}
-trap 'rm -f .tmp-tag* .tagmsg .editmsg' 0
+trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0
if [ "$annotate" ]; then
if [ -z "$message" ]; then
( echo "#"
echo "# Write a tag message"
- echo "#" ) > .editmsg
- ${VISUAL:-${EDITOR:-vi}} .editmsg || exit
+ echo "#" ) > "$GIT_DIR"/TAG_EDITMSG
+ ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit
else
- echo "$message" > .editmsg
+ echo "$message" >"$GIT_DIR"/TAG_EDITMSG
fi
- grep -v '^#' < .editmsg | git-stripspace > .tagmsg
+ grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG |
+ git-stripspace >"$GIT_DIR"/TAG_FINALMSG
- [ -s .tagmsg ] || {
+ [ -s "$GIT_DIR"/TAG_FINALMSG ] || {
echo >&2 "No tag message?"
exit 1
}
- ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; cat .tagmsg ) > .tmp-tag
- rm -f .tmp-tag.asc .tagmsg
+ ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n";
+ cat "$GIT_DIR"/TAG_FINALMSG ) >"$GIT_DIR"/TAG_TMP
+ rm -f "$GIT_DIR"/TAG_TMP.asc "$GIT_DIR"/TAG_FINALMSG
if [ "$signed" ]; then
- gpg -bsa -u "$username" .tmp-tag &&
- cat .tmp-tag.asc >>.tmp-tag ||
+ gpg -bsa -u "$username" "$GIT_DIR"/TAG_TMP &&
+ cat "$GIT_DIR"/TAG_TMP.asc >>"$GIT_DIR"/TAG_TMP ||
die "failed to sign the tag with GPG."
fi
- object=$(git-mktag < .tmp-tag)
+ object=$(git-mktag < "$GIT_DIR"/TAG_TMP)
fi
mkdir -p "$GIT_DIR/refs/tags"