Intégration de la branche release-2.17.1

This commit is contained in:
Jephté Clain 2015-09-26 12:21:50 +04:00
commit 0de8da913b
3 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,7 @@
## Version 2.17.1 du 26/09/2015-12:21
c8c6744 pxs: support des versions <= 5.20150825
## Version 2.17.0 du 26/09/2015-11:51
552e4ba améliorer pxs pour un dépôt en mode direct

View File

@ -1 +1 @@
2.17.0
2.17.1

View File

@ -238,11 +238,9 @@ elif array_contains VCS_CMDS "$CMD"; then
elif array_contains GITANNEX_CMDS "$CMD"; then
function xsync() {
if is_yes "$(git config --get annex.direct)"; then
git annex sync --pull --no-commit --no-push --no-content &&
git annex add &&
git annex sync --no-pull --commit --no-push --no-content &&
git annex sync --no-pull --no-commit --no-push --content &&
git annex sync --no-pull --no-commit --push --no-content &&
git annex sync &&
git annex sync --content &&
git annex sync
else
git annex sync