Skip to content

Commit afd46b3

Browse files
author
Junio C Hamano
committed
Use describe to name the revision.
1 parent ceb90a5 commit afd46b3

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

dodoc.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ test "$DOCREPO" != "" &&
3636
cd "$DOCREPO" || exit $?
3737

3838
git pull "$MASTERREPO" master &&
39-
test $(git-rev-parse --verify refs/heads/master) == "$ID" || exit $?
39+
test $(git-rev-parse --verify refs/heads/master) == "$ID" &&
40+
NID=$(git-describe --abbrev=4 "$ID") &&
41+
test '' != "$NID" || exit $?
4042

4143
# Set up subrepositories
4244
test -d doc-htmlpages || (
@@ -76,7 +78,7 @@ fi || exit $?
7678

7779
cd ../doc-htmlpages &&
7880
git add . &&
79-
if git commit -a -m "Autogenerated HTML docs for $ID"
81+
if git commit -a -m "Autogenerated HTML docs for $NID"
8082
then
8183
git-send-pack "$MASTERREPO" master:refs/heads/html || {
8284
echo "* HTML failure"
@@ -92,7 +94,7 @@ make man1="$DOCREPO/doc-manpages/man1" man7="$DOCREPO/doc-manpages/man7" \
9294

9395
cd ../doc-manpages &&
9496
git add . &&
95-
if git commit -a -m "Autogenerated man pages for $ID"
97+
if git commit -a -m "Autogenerated man pages for $NID"
9698
then
9799
git-send-pack "$MASTERREPO" master:refs/heads/man || {
98100
echo "* man failure"

0 commit comments

Comments
 (0)