From b3665606a93bcc3ab97a6b2409d2cee8be8d5d19 Mon Sep 17 00:00:00 2001 From: "Philipp A. Hartmann" Date: Wed, 9 Jul 2014 08:01:25 +0200 Subject: [PATCH] fixup travis doxygen build --- build/travis-doxygen.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/travis-doxygen.sh b/build/travis-doxygen.sh index 8e64269..4d1d57b 100755 --- a/build/travis-doxygen.sh +++ b/build/travis-doxygen.sh @@ -63,10 +63,11 @@ gh_pages_prepare() cd "${TRAVIS_BUILD_DIR}/doc"; [ ! -d "html" ] || \ abort "Doxygen target directory already exists." - git config --global user.name "${GIT_NAME}" - git config --global user.email "${GIT_EMAIL}" git clone --single-branch -b gh-pages ${GHPAGES_BASE} html cd html + # setup git config (with defaults) + git config user.name "${GIT_NAME-travis}" + git config user.email "${GIT_EMAIL-"travis@localhost"}" # clean working dir rm -f .git/index git clean -df @@ -75,7 +76,7 @@ gh_pages_prepare() gh_pages_commit() { cd "${TRAVIS_BUILD_DIR}/doc/html"; git add --all; - git commit -m "Automatic doxygen build"; + git diff-index --quiet HEAD || git commit -m "Automatic doxygen build"; } gh_pages_push() {