From 9dcd60b2441a05e18d05d982d7786494bdee3afb Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Thu, 3 Sep 2015 09:04:26 +0400 Subject: [PATCH 1/2] =?UTF-8?q?pxs=20transfert=20les=20donn=C3=A9es=20auss?= =?UTF-8?q?i=20en=20mode=20direct?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uproject | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 From 57474f52eab405deb691d1c4a6467e91a3159510 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Thu, 3 Sep 2015 09:04:47 +0400 Subject: [PATCH 2/2] Init changelog & version 2.14.0 --- CHANGES.txt | 4 ++++ VERSION.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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