X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=dodoc.sh;h=8202a6047b2ea9dd5db542a03e4a44b5a8082b46;hb=6f4a70cb236d34b8152f998678be10e7e173f16f;hp=82f3493e9175fe3ca80f2a847900d675c898e8c9;hpb=337ceeabe13ee55d80dab89799cb0b0af2e17bb0;p=git.git

diff --git a/dodoc.sh b/dodoc.sh
index 82f3493e..8202a604 100755
--- a/dodoc.sh
+++ b/dodoc.sh
@@ -36,7 +36,9 @@ test "$DOCREPO" != "" &&
 cd "$DOCREPO" || exit $?
 
 git pull "$MASTERREPO" master &&
-test $(git-rev-parse --verify refs/heads/master) == "$ID" ||  exit $?
+test $(git-rev-parse --verify refs/heads/master) == "$ID" &&
+NID=$(git-describe --abbrev=4 "$ID") &&
+test '' != "$NID" ||  exit $?
 
 # Set up subrepositories
 test -d doc-htmlpages || (
@@ -76,7 +78,7 @@ fi || exit $?
 
 cd ../doc-htmlpages &&
     git add . &&
-    if git commit -a -m "Autogenerated HTML docs for $ID"
+    if git commit -a -m "Autogenerated HTML docs for $NID"
     then
 	git-send-pack "$MASTERREPO" master:refs/heads/html || {
 	    echo "* HTML failure"
@@ -92,7 +94,7 @@ make man1="$DOCREPO/doc-manpages/man1" man7="$DOCREPO/doc-manpages/man7" \
 
 cd ../doc-manpages &&
     git add . &&
-    if git commit -a -m "Autogenerated man pages for $ID"
+    if git commit -a -m "Autogenerated man pages for $NID"
     then
 	git-send-pack "$MASTERREPO" master:refs/heads/man || {
 	    echo "* man failure"