diff --git a/CHANGES.txt b/CHANGES.txt index 872247e..067f1c7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +## Version 2.14.0 du 03/09/2015-09:04 + +9dcd60b pxs transfert les données aussi en mode direct + ## Version 2.13.0 du 01/09/2015-15:44 8d2e386 uscrontab: permettre d'ignorer le code d'erreur pour une commande planifiée diff --git a/VERSION.txt b/VERSION.txt index fb2c076..edcfe40 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -2.13.0 +2.14.0 diff --git a/uproject b/uproject index 36dc4ae..9df4a0a 100755 --- a/uproject +++ b/uproject @@ -236,10 +236,16 @@ elif array_contains VCS_CMDS "$CMD"; then "vcs_$CMD" "$@" elif array_contains GITANNEX_CMDS "$CMD"; then + function xsync() { + local direct + is_yes "$(git config --get annex.direct)" && direct=1 + git annex sync ${direct:+--content} + } use_ssh_wrapper case "$CMD" in annex) git annex "$@";; - xcopy|xmove|xget) git annex "${CMD#x}" "$@" && git annex sync;; + xsync) xsync;; + xcopy|xmove|xget) git annex "${CMD#x}" "$@" && xsync;; xinitial) git_annex_initial "$@";; *) git annex "${CMD#x}" "$@";; esac