Commit graph

29976 commits

Author SHA1 Message Date
Joey Hess
57e923b712
gcrypt: Support re-enabling to change eg, encryption parameters.
This was never supported before. And it doesn't re-encrypt the
gcrypt repo to the new gcrypt-participants, but it does at least now not
crash, and set gcrypt-participants.

This commit was sponsored by andrea rota.
2017-04-07 14:10:34 -04:00
Joey Hess
99984967eb
enableremote: Fix re-enabling of existing gcrypt remotes, so that eg, encryption key changes take effect.
They were silently ignored, a reversion introduced in 6.20160527.

I don't like this regular git remote special case in enableremote, but I
can't see a way to get rid of it. So, check if the existing remote is
a Remote.Git

This commit was sponsored by Trenton Cronholm on Patreon.
2017-04-07 13:51:09 -04:00
Joey Hess
f406d16525
enableremote: When enabling a non-special remote, param=value parameters can't be used, so error out if any are provided.
This commit was sponsored by Riku Voipio.
2017-04-07 13:14:53 -04:00
Joey Hess
20b634c82c
comment 2017-04-07 12:54:04 -04:00
Joey Hess
78f74aa295
confused user, not a bug 2017-04-07 12:47:42 -04:00
Joey Hess
de649e4fbb
comment 2017-04-07 12:40:55 -04:00
Joey Hess
b0999afbfc
partial analysis 2017-04-07 12:34:19 -04:00
Joey Hess
b6f26bac86
Disable git-annex's support for GIT_SSH and GIT_SSH_COMMAND, unless 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.
2017-04-07 11:35:27 -04:00
Joey Hess
edf1aeda65
Merge branch 'master' of ssh://git-annex.branchable.com 2017-04-06 14:24:40 -04:00
woffs
74400e294b Added a comment 2017-04-06 08:28:06 +00:00
woffs
3d3a573746 Added a comment 2017-04-06 07:29:14 +00:00
spwhitton
c74490e627 Added a comment 2017-04-05 22:28:11 +00:00
Joey Hess
8ae16f902f
devblog 2017-04-05 16:47:29 -04:00
archimedes
f62dbd7445 Added a comment 2017-04-05 20:01:44 +00:00
Joey Hess
239cf833a3
response 2017-04-05 15:19:03 -04:00
archimedes
67b9805a3e 2017-04-05 19:05:07 +00:00
Joey Hess
ee8bbf33bb
followup 2017-04-05 14:47:49 -04:00
Joey Hess
8c722069ea
Merge branch 'master' of ssh://git-annex.branchable.com 2017-04-05 13:27:29 -04:00
Joey Hess
29e73f76ef
Added remote.<name>.annex-push and remote.<name>.annex-pull
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.
2017-04-05 13:22:35 -04:00
git-annex@6f13b739194f758abc0b86556b7ce966c1bf3c00
f6b1a2a027 Added a comment: git-remote-gcrypt recommends rsync:// or sftp:// transports 2017-04-05 16:16:25 +00:00
Joey Hess
eab6146e53
comment 2017-04-05 11:59:03 -04:00
Joey Hess
e7d684b4e3
comment 2017-04-05 11:51:51 -04:00
Joey Hess
816c0d597a
comment 2017-04-05 11:47:08 -04:00
Joey Hess
ee9b85f390
comment 2017-04-05 11:44:29 -04:00
Joey Hess
3b84209c17
comment 2017-04-05 11:41:59 -04:00
Joey Hess
74af1d2dfe
comment 2017-04-05 11:25:18 -04:00
Joey Hess
c6d5d8f9bf
fix windows build 2017-04-05 11:19:29 -04:00
Yaroslav Halchenko
6f9b3875d6
refreshed standalone debian pkg patch for uftp being added to suggests 2017-04-03 15:58:10 -04:00
Joey Hess
d9766d4aa7
Merge branch 'master' of ssh://git-annex.branchable.com 2017-04-03 14:53:49 -04:00
Joey Hess
256eb4807e
add missing "do"
Unsure how it got committed in an uncompilable state before..
2017-04-03 14:52:54 -04:00
t.z.mates
e1642d19aa Added a comment 2017-04-02 04:17:55 +00:00
anarcat
1f6b8951ba Added a comment: point to point? 2017-03-31 13:09:00 +00:00
Joey Hess
74a06b535c
devblog 2017-03-30 19:38:47 -04:00
Joey Hess
c3970f6c1a
multicast: New command, uses uftp to multicast annexed files, for eg a classroom setting.
This commit was supported by the NSF-funded DataLad project.
2017-03-30 19:35:30 -04:00
Joey Hess
39e8433d46
fix format 2017-03-30 14:16:13 -04:00
Joey Hess
43d7862b44
design 2017-03-30 14:15:12 -04:00
Joey Hess
2f4af8ef93
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-30 12:51:14 -04:00
yarikoptic
3a03665b4f 2017-03-30 16:08:07 +00:00
yarikoptic
f6d34d228e initial idea 2017-03-30 16:07:43 +00:00
Joey Hess
a7b068f271
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-30 11:31:38 -04:00
anarcat
d2dd75f2b9 Added a comment: onion-grater 2017-03-30 14:49:13 +00:00
oberix@c7a19cddb1663df0c612a979b9d13b0d67f1f69a
a5b3b7a5a4 Added a comment: autostart and foreground together doesn't seem to work 2017-03-30 10:43:19 +00:00
woffs
627ee14612 2017-03-29 20:24:14 +00:00
Joey Hess
3c8eb59860
When a http remote does not expose an annex.uuid config, only warn about it once, not every time git-annex is run.
Same behavior as for a ssh remote.
2017-03-29 12:43:47 -04:00
fabfur
3795278338 2017-03-28 20:25:39 +00:00
Joey Hess
d6afd70e20 WSL can now run git-annex 2017-03-27 21:40:45 -04:00
Joey Hess
0e7276b5ac stack.yaml: Update to lts-8.6. 2017-03-27 20:01:46 -04:00
Joey Hess
a2017e944f expand 2017-03-27 18:12:46 -04:00
Joey Hess
9ee05e66a6 Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-27 18:10:44 -04:00
Joey Hess
9fcd3987f2 idea 2017-03-27 18:10:36 -04:00