summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* Disable git-annex's support for GIT_SSH and GIT_SSH_COMMAND, unless ↵Gravatar Joey Hess2017-04-07
| | | | | | | | | | | | | | | | | | | | GIT_ANNEX_USE_GIT_SSH=1 is also set in the environment. This is necessary because as feared, the extra -n parameter that git-annex passes breaks uses of these environment variables that expect exactly the parameters that git passes. For example, see https://github.com/datalad/datalad/issues/1456 It would of course be possible to pre-close stdin before running ssh so not needing the -n, and I think that would not even break ssh's password caching. But it would probably involve a lot of work, possibly would need to deal with some layering violations, and would be error-prone. The really clean fix would be to make all the ssh stuff return a CreateProcess, which could have the handle closed when appropriate, but that would be a large reworing of the code base. This commit was supported by the NSF-funded DataLad project.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-04-06
|\
| * Added a commentGravatar woffs2017-04-06
| |
| * Added a commentGravatar woffs2017-04-06
| |
| * Added a commentGravatar spwhitton2017-04-05
| |
* | devblogGravatar Joey Hess2017-04-05
| |
| * Added a commentGravatar archimedes2017-04-05
|/
* responseGravatar Joey Hess2017-04-05
|
* (no commit message)Gravatar archimedes2017-04-05
|
* followupGravatar Joey Hess2017-04-05
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-04-05
|\
* | Added remote.<name>.annex-push and remote.<name>.annex-pullGravatar Joey Hess2017-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former can be useful to make remotes that don't get fully synced with local changes, which comes up in a lot of situations. The latter was mostly added for symmetry, but could be useful (though less likely to be). Implementing `remote.<name>.annex-pull` was a bit tricky, as there's no one place where git-annex pulls/fetches from remotes. I audited all instances of "fetch" and "pull". A few cases were left not checking this config: * Git.Repair can try to pull missing refs from a remote, and if the local repo is corrupted, that seems a reasonable thing to do even though the config would normally prevent it. * Assistant.WebApp.Gpg and Remote.Gcrypt and Remote.Git do fetches as part of the setup process of a remote. The config would probably not be set then, and having the setup fail seems worse than honoring it if it is already set. I have not prevented all the code that does a "merge" from merging branches from remotes with remote.<name>.annex-pull=false. That could perhaps be done, but it would need a way to map from branch name to remote name, and the way refspecs work makes that hard to get really correct. So if the user fetches manually, the git-annex branch will get merged, for example. Anther way of looking at/justifying this is that the setting is called "annex-pull", not "annex-merge". This commit was supported by the NSF-funded DataLad project.
| * Added a comment: git-remote-gcrypt recommends rsync:// or sftp:// transportsGravatar git-annex@6f13b739194f758abc0b86556b7ce966c1bf3c002017-04-05
|/
* commentGravatar Joey Hess2017-04-05
|
* commentGravatar Joey Hess2017-04-05
|
* commentGravatar Joey Hess2017-04-05
|
* commentGravatar Joey Hess2017-04-05
|
* commentGravatar Joey Hess2017-04-05
|
* commentGravatar Joey Hess2017-04-05
|
* fix windows buildGravatar Joey Hess2017-04-05
|
* refreshed standalone debian pkg patch for uftp being added to suggestsGravatar Yaroslav Halchenko2017-04-03
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-04-03
|\
* | add missing "do"Gravatar Joey Hess2017-04-03
| | | | | | | | Unsure how it got committed in an uncompilable state before..
| * Added a commentGravatar t.z.mates2017-04-02
| |
| * Added a comment: point to point?Gravatar anarcat2017-03-31
|/
* devblogGravatar Joey Hess2017-03-30
|
* multicast: New command, uses uftp to multicast annexed files, for eg a ↵Gravatar Joey Hess2017-03-30
| | | | | | classroom setting. This commit was supported by the NSF-funded DataLad project.
* fix formatGravatar Joey Hess2017-03-30
|
* designGravatar Joey Hess2017-03-30
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-30
|\
| * (no commit message)Gravatar yarikoptic2017-03-30
| |
| * initial ideaGravatar yarikoptic2017-03-30
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-30
|\|
| * Added a comment: onion-graterGravatar anarcat2017-03-30
| |
| * Added a comment: autostart and foreground together doesn't seem to workGravatar oberix@c7a19cddb1663df0c612a979b9d13b0d67f1f69a2017-03-30
| |
| * (no commit message)Gravatar woffs2017-03-29
| |
* | When a http remote does not expose an annex.uuid config, only warn about it ↵Gravatar Joey Hess2017-03-29
|/ | | | | | once, not every time git-annex is run. Same behavior as for a ssh remote.
* (no commit message)Gravatar fabfur2017-03-28
|
* WSL can now run git-annexGravatar Joey Hess2017-03-27
|
* stack.yaml: Update to lts-8.6.Gravatar Joey Hess2017-03-27
|
* expandGravatar Joey Hess2017-03-27
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-27
|\
* | ideaGravatar Joey Hess2017-03-27
| |
| * add annex-sync setting sampleGravatar anarcat2017-03-27
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-27
|\
* | bug report from Hands-on Reproducible and Scalable Brain Imaging Analysis ↵Gravatar Joey Hess2017-03-27
| | | | | | | | with Nipype
| * link to torrent pageGravatar anarcat2017-03-27
| |
| * some issue i have come up with a few times and workaroundsGravatar anarcat2017-03-27
|/
* (no commit message)Gravatar benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e32017-03-27
|
* (no commit message)Gravatar benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e32017-03-27
|