www

commit 3d1559afadb3a4b5e6939b6854ad9ab3001e9f98
parent 9f68e2ea14c5250d6335f5083a2cee3c0e0a4df1
Author: Georges Dupéron <georges.duperon@gmail.com>
Date:   Mon,  2 Jul 2018 22:19:54 +0200

Recursive rsync to merge the new files with the base commit, preserve permissions

Diffstat:
M
utils/auto-push.sh
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/auto-push.sh b/utils/auto-push.sh
@@ -66,7 +66,7 @@ else
   if test -e "$TRAVIS_AUTO_PUSH_REPO_DIR"; then rm -rf "$TRAVIS_AUTO_PUSH_REPO_DIR"; fi
   git clone -b "$deploy_base_commit" --depth 1 --shallow-submodules "$deploy_repo" "$TRAVIS_AUTO_PUSH_REPO_DIR"
   (cd "$TRAVIS_AUTO_PUSH_REPO_DIR" && git checkout -b "$deploy_branch")
-  rsync "${deploy_directory}/" "${TRAVIS_AUTO_PUSH_REPO_DIR}/"
+  rsync -a "${deploy_directory}/" "${TRAVIS_AUTO_PUSH_REPO_DIR}/"
   (cd "$TRAVIS_AUTO_PUSH_REPO_DIR" && git add -A . && git commit -m "Auto-publish to $deploy_branch") > commit.log || (cat commit.log && exit 1)
   (cd "$TRAVIS_AUTO_PUSH_REPO_DIR" && git log --oneline --decorate --graph -10)
   echo '(cd '"$TRAVIS_AUTO_PUSH_REPO_DIR"' && git push --force --quiet "'"$deploy_repo"'" "master:'"$deploy_branch"'")'