undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-tag: Do not assume the working tree root is writable.

Browse Source 
This is a long overdue companion commit that fixed git-commit
(Santi's f8e2c54c9a).

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>
This commit is contained in:
Junio C Hamano 2005-11-03 15:26:43 -08:00
parent 50496b2170
commit a10aad6a9a
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
git-tag.sh
View File

@ -61,33 +61,35 @@ type=$(git-cat-file -t $object) || exit 1
tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1 tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
: ${username:=$(expr "$tagger" : '\(.*>\)')} : ${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 [ "$annotate" ]; then
if [ -z "$message" ]; then if [ -z "$message" ]; then
( echo "#" ( echo "#"
echo "# Write a tag message" echo "# Write a tag message"
echo "#" ) > .editmsg echo "#" ) > "$GIT_DIR"/TAG_EDITMSG
${VISUAL:-${EDITOR:-vi}} .editmsg || exit ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit
else else
echo "$message" > .editmsg echo "$message" >"$GIT_DIR"/TAG_EDITMSG
fi 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?" echo >&2 "No tag message?"
exit 1 exit 1
} }
( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; cat .tagmsg ) > .tmp-tag ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n";
rm -f .tmp-tag.asc .tagmsg cat "$GIT_DIR"/TAG_FINALMSG ) >"$GIT_DIR"/TAG_TMP
rm -f "$GIT_DIR"/TAG_TMP.asc "$GIT_DIR"/TAG_FINALMSG
if [ "$signed" ]; then if [ "$signed" ]; then
gpg -bsa -u "$username" .tmp-tag && gpg -bsa -u "$username" "$GIT_DIR"/TAG_TMP &&
cat .tmp-tag.asc >>.tmp-tag || cat "$GIT_DIR"/TAG_TMP.asc >>"$GIT_DIR"/TAG_TMP ||
die "failed to sign the tag with GPG." die "failed to sign the tag with GPG."
fi fi
object=$(git-mktag < .tmp-tag) object=$(git-mktag < "$GIT_DIR"/TAG_TMP)
fi fi
mkdir -p "$GIT_DIR/refs/tags" mkdir -p "$GIT_DIR/refs/tags"