Commit graph

33799 commits

Author SHA1 Message Date
Joey Hess
14e6d7cf2d
comment 2018-12-04 16:55:36 -04:00
anarcat
5e3bb14873 another v7 catch? 2018-12-04 20:41:08 +00:00
Ilya_Shlyakhter
8f87be6622 Added a comment 2018-12-04 19:56:36 +00:00
lukasstraub2@bbbb2ef261a0994edda5f5f55999dfac5998d4e5
2e4b39b307 Added a comment: Workaround 2018-12-04 19:37:38 +00:00
Joey Hess
8d0d00d926
fix typo 2018-12-04 15:23:04 -04:00
Joey Hess
78879b5b36
response 2018-12-04 15:20:40 -04:00
Joey Hess
31d44d5726
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-04 15:20:00 -04:00
Joey Hess
e83af72e99
remove libghc-stm-dev dep
It moved into ghc, so bump ghc version.
2018-12-04 15:12:07 -04:00
Ilya_Shlyakhter
5c510f6937 fixed markup 2018-12-04 18:58:04 +00:00
Ilya_Shlyakhter
00ccf952e4 added suggestion for encrypting URLs 2018-12-04 18:57:04 +00:00
Ilya_Shlyakhter
ae0196df7e Added a comment 2018-12-04 18:40:02 +00:00
Joey Hess
635692410b
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-04 14:18:31 -04:00
Joey Hess
ab7746a2ae
annex.cachecreds: New config to allow disabling of credentials caching for special remotes.
Note that it does not prevent storing p2p access tokens or multicast
encryption keys, since those are not cached; the previous commit
established the distinction.

How well this works depends on how often getRemoteCredPair is called and
how expensive it is. In some cases setting this will result in an annoying
number of gpg password prompts and/or slowdowns due to reading creds
from the git-annex branch and decrypting, which could be improved by calling
getRemoteCredPair less often.

This commit was sponsored by Ilya Shlyakhter on Patreon.
2018-12-04 14:16:56 -04:00
Joey Hess
e89bb4361b
distinguish between cached and uncached creds
p2p and multicast creds are not cached the same way that s3 and webdav
creds are. The difference is that p2p and multicast obtain the creds
themselves, as part of a process like pairing. So they're storing the
only extant copy of the creds. In s3 and webdav etc the creds are
provided by the cloud storage provider.

This is a fine difference, but I do think it's a reasonable difference.
If the user wants to prevent s3 and webdav etc creds from being stored
unencrypted on disk, they won't feel the same about p2p auth tokens
used for tor, or a multicast encryption key, or for that matter their
local ssh private key.

This commit was sponsored by Fernando Jimenez on Patreon.
2018-12-04 14:09:18 -04:00
Joey Hess
736ecbe4b8
update 2018-12-04 13:40:50 -04:00
Joey Hess
1308a76bf1
deMaybe credPairRemoteKey
It's always Just
2018-12-04 13:37:43 -04:00
Joey Hess
b184f158a5
response 2018-12-04 13:17:42 -04:00
Joey Hess
51eea6fcfa
close 2018-12-04 13:15:16 -04:00
Joey Hess
32234ebe23
respond 2018-12-04 13:13:57 -04:00
Joey Hess
ba0bd4f9ea
followup 2018-12-04 13:11:00 -04:00
anarcat
76ed3303df Added a comment: thanks! 2018-12-04 17:10:16 +00:00
Joey Hess
aa8243df4c
dropunused edge case when annex.thin caused unused object to be modified
dropunused: When an unused object file has gotten modified, eg due to
annex.thin being set, don't silently skip it, but display a warning and let
--force drop it.

This commit was sponsored by Ethan Aubin.
2018-12-04 12:20:34 -04:00
Joey Hess
96d2000570
analysis, already fixed 2018-12-04 12:17:48 -04:00
xsteadfastx
e4dedb352a Added a comment 2018-12-04 09:46:47 +00:00
anarcat
956d8377d5 oops, problem between keyboard and chair? 2018-12-04 01:54:11 +00:00
anarcat
13fd7cf00e some user confusion with v7 repos 2018-12-04 01:50:29 +00:00
anarcat
da9c82796a mention that git annex upgrade is required for v6 as well (a tad late, but it's still in stable and backports) 2018-12-03 21:04:21 +00:00
anarcat
a419f01ddb fix typo and whitespace 2018-12-03 21:03:38 +00:00
Joey Hess
3aab5164e9
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-03 14:45:46 -04:00
Joey Hess
a25fef36ad
fix json for exportedtrees in conflict
Repeating the same json field with multiple values tends to not be
supported well by json parsers, so list the trees separated by spaces.
2018-12-03 14:43:59 -04:00
StéphaneGL
20d811f55a 2018-12-03 18:40:17 +00:00
Joey Hess
b71d62b1aa
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-03 14:36:22 -04:00
Joey Hess
b8f9dea27d
add exportedtree to info
info: When used with an exporttree remote, includes an "exportedtree" info,
which is the tree last exported to the remote. During an export conflict,
multiple values will be listed.

This commit was sponsored by John Pellman on Patreon.
2018-12-03 14:36:00 -04:00
StéphaneGL
8f58627a48 Added a comment 2018-12-03 18:22:10 +00:00
StéphaneGL
e29f5c4b26 removed 2018-12-03 18:21:38 +00:00
StéphaneGL
d502eebd42 Added a comment 2018-12-03 18:20:29 +00:00
Joey Hess
3ad7b7927e
comment 2018-12-03 13:52:10 -04:00
Joey Hess
2544a24765
merge 2018-12-03 13:42:56 -04:00
Joey Hess
f386d8556d
remove spam
This particular page is attacting spam, I assume because of google rank.
I will have to lock comments to it I'm afraid.
2018-12-03 13:36:11 -04:00
Joey Hess
7a2d257159
comment 2018-12-03 13:35:23 -04:00
Joey Hess
41eb9d405e
followup 2018-12-03 13:31:20 -04:00
Joey Hess
bc4aa3f0e3
comment 2018-12-03 13:26:00 -04:00
Joey Hess
33085f4bfe
followup 2018-12-03 13:23:46 -04:00
Joey Hess
ae3beccd7c
comment 2018-12-03 13:07:40 -04:00
Joey Hess
3a9a6bc56b
response 2018-12-03 12:59:42 -04:00
Joey Hess
865d556103
fix init in cripped filesystem version issues
* init: When a crippled filesystem causes an adjusted unlocked branch to
  be used, set repo version to 7, which it neglected to do before.
* init: When on a crippled filesystem, and the git version is too old
  to use an adjusted unlocked branch, fall back to using direct mode.

This commit was sponsored by Ilya Shlyakhter on Patreon.
2018-12-03 12:57:23 -04:00
spwhitton
89abe04eb8 Added a comment 2018-12-03 16:38:12 +00:00
Joey Hess
1948af854e
fixed 2018-12-03 12:33:54 -04:00
Joey Hess
19372e47ea
Fix build without concurrent-output.
This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2018-12-03 12:33:00 -04:00
spwhitton
62f90eed06 post bug 2018-12-02 16:40:27 +00:00