Commit graph

22039 commits

Author SHA1 Message Date
Joey Hess
995f58a04c
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-02 13:19:13 -04:00
Joey Hess
e83a2a2691
comment 2017-03-02 13:18:37 -04:00
git-annex@31849d241f10c295b30a9707352ae5c7d743adb7
2468e69354 Added a comment 2017-03-02 16:16:05 +00:00
git-annex@31849d241f10c295b30a9707352ae5c7d743adb7
273decc078 removed 2017-03-02 16:15:44 +00:00
git-annex@31849d241f10c295b30a9707352ae5c7d743adb7
fcdc72f807 Added a comment 2017-03-02 16:14:52 +00:00
Michel
6e6a90805d 2017-03-02 09:20:15 +00:00
Joey Hess
e3a03af24e
github mirror has been removed due to their horrible new anti-free-software TOS 2017-03-01 13:28:02 -04:00
Joey Hess
463dda3879
add news item for git-annex 6.20170301.1 2017-03-01 12:51:18 -04:00
Joey Hess
bd5b277c11
add news item for git-annex 6.20170301 2017-03-01 12:10:20 -04:00
yarikoptic
bc768d96a9 initial whining 2017-03-01 14:34:35 +00:00
dvicory
e4642a2452 Added a comment: Security of P2P repo is unclear 2017-02-28 20:30:31 +00:00
Joey Hess
739aa3a38e
add news item for git-annex 6.20170228 2017-02-28 14:42:28 -04:00
zpeters
a21c1ddbe6 Added a comment: RE: choosing remotes and annex-cost-command 2017-02-28 01:10:05 +00:00
Joey Hess
2c281baf00
better headings 2017-02-27 16:18:20 -04:00
Joey Hess
3f876f72e3
larger headings 2017-02-27 16:17:19 -04:00
Joey Hess
b78703ca4e
devblog 2017-02-27 16:11:35 -04:00
Joey Hess
e53070c1ff
inheritable annex.securehashesonly
* init: When annex.securehashesonly has been set with git-annex config,
  copy that value to the annex.securehashesonly git config.
* config --set: As well as setting value in git-annex branch,
  set local gitconfig. This is needed especially for
  annex.securehashesonly, which is read only from local gitconfig and not
  the git-annex branch.

doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn has the
rationalle for doing it this way. There's no perfect solution; this
seems to be the least-bad one.

This commit was supported by the NSF-funded DataLad project.
2017-02-27 16:08:23 -04:00
Joey Hess
6e0e7d885c
update 2017-02-27 15:32:04 -04:00
Joey Hess
49114cf4ea
securehash matching
Added --securehash option to match files using a secure hash function, and
corresponding securehash preferred content expression.

This commit was sponsored by Ethan Aubin.
2017-02-27 15:02:44 -04:00
Joey Hess
942e0174b3
make fsck check annex.securehashesonly, and new tip for working around SHA1 collisions with git-annex
This commit was sponsored by andrea rota.
2017-02-27 13:55:15 -04:00
Joey Hess
5e24e3ffe7
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-26 14:55:11 -04:00
michalrus
b4f7979391 Added a comment 2017-02-26 00:59:21 +00:00
openmedi
9bb93e2129 Added a comment 2017-02-25 20:35:53 +00:00
Joey Hess
e8bf942dc4
move thoughts 2017-02-25 15:00:22 -04:00
michalrus
03826e9759 2017-02-25 18:53:27 +00:00
Joey Hess
a463ba6e8a
more thoughts 2017-02-25 14:49:44 -04:00
michalrus
5fb21f1260 Added a comment 2017-02-25 18:47:36 +00:00
Joey Hess
d512098cbb
further thoughts 2017-02-25 12:55:38 -04:00
Joey Hess
622b3fface
devblog 2017-02-24 20:03:36 -04:00
Joey Hess
6b52fcbb7e
SHA1 collisions in key names was more exploitable than I thought
Yesterday's SHA1 collision attack could be used to generate eg:

SHA256-sfoo--whatever.good
SHA256-sfoo--whatever.bad

Such that they collide. A repository with the good one could have the
bad one swapped in and signed commits would still verify.

I've already mitigated this.
2017-02-24 19:54:36 -04:00
Joey Hess
634a485b50
update 2017-02-24 17:57:21 -04:00
Joey Hess
1f0d0ab4b3
Revert "pointer to a todo"
This reverts commit ae3f6705eb.

todo is not ready yet
2017-02-24 15:40:28 -04:00
Joey Hess
ae3f6705eb
pointer to a todo 2017-02-24 13:41:29 -04:00
Joey Hess
9de0767d0e
update 2017-02-24 12:31:23 -04:00
Joey Hess
6346704a04
clarify that annex.backends is used when adding new files
Even if annex.backends does not include a backend, that does not prevent
git-annex commands from acting on a file using the missing backend.

(There's really no reason at all for annex.backends to be a list.)
2017-02-24 11:53:59 -04:00
Joey Hess
8971949d60
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-24 11:33:57 -04:00
Joey Hess
35739a74c2
make file2key reject E* backend keys with a long extension
I am not happy that I had to put backend-specific code in file2key. But
it would be very difficult to avoid this layering violation.

Most of the time, when parsing a Key from a symlink target, git-annex
never looks up its Backend at all, so adding this check to a method of
the Backend object would not work.

The Key could be made to contain the appropriate
Backend, but since Backend is parameterized on an "a" that is fixed to
the Annex monad later, that would need Key to change to "Key a".

The only way to clean this up that I can see would be to have the Key
contain a LowlevelBackend, and put the validation in LowlevelBackend.
Perhaps later, but that would be an extensive change, so let's not do
it in this commit which may want to cherry-pick to backports.

This commit was sponsored by Ethan Aubin.
2017-02-24 11:22:15 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
4a7ae6f9c0 Added a comment 2017-02-24 13:00:10 +00:00
Joey Hess
63df8d8966
update 2017-02-24 02:14:36 -04:00
Joey Hess
44b9ac41a4
update 2017-02-24 01:21:54 -04:00
Joey Hess
4cad401629
updates 2017-02-24 00:28:15 -04:00
Joey Hess
969da82b5c
update 2017-02-24 00:21:58 -04:00
Joey Hess
60d99a80a6
Tighten key parser to not accept keys containing a non-numeric fields, which could be used to embed data useful for a SHA1 attack against git.
Also todo about why this is important, and with some further hardening to
add.

This commit was sponsored by Ignacio on Patreon.
2017-02-24 00:17:25 -04:00
Joey Hess
0dec2257f0
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-23 19:08:03 -04:00
Joey Hess
5a88cab005
add para 2017-02-23 19:06:06 -04:00
unicell@9c0b0afd4176d5933d4b5c41350ebe61488c1df0
342e256bc5 Added a comment 2017-02-23 23:05:10 +00:00
Joey Hess
9bee19ed38
slight correction 2017-02-23 17:11:46 -04:00
Joey Hess
aa8ab352f2
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-23 16:44:07 -04:00
Joey Hess
aae9e15a97
devblog 2017-02-23 16:43:15 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
9f9d7ae029 Added a comment 2017-02-22 16:48:04 +00:00
lhunath@3b4ff15f4600f3276d1776a490b734fca0f5c245
a9a15f63a4 2017-02-22 16:12:10 +00:00
jean.jordaan@4bb3bd508a9eb0a4bab5d1b587dadd2b6c4a7edc
581144a988 2017-02-22 04:23:29 +00:00
jean.jordaan@4bb3bd508a9eb0a4bab5d1b587dadd2b6c4a7edc
3c7b7ebf0c 2017-02-22 04:22:51 +00:00
db48x
283aca3dfb 2017-02-22 00:37:22 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
69f7b8af48 Added a comment 2017-02-21 06:20:35 +00:00
Joey Hess
75a15e1ad7
status: Pass --ignore-submodules=when option on to git status.
Didn't make --ignore-submodules without a value be handled because I can't
see a way to make optparse-applicative parse that. I've opened a bug
requesting a way to do that:
https://github.com/pcapriotti/optparse-applicative/issues/243
2017-02-20 17:01:24 -04:00
Joey Hess
a53daff32c
question 2017-02-20 16:14:43 -04:00
Joey Hess
7a0d6d81a0
make curl show http errors to stderr
* Run curl with -S, so HTTP errors are displayed, even when
  it's otherwise silent.
* When downloading in --json or --quiet mode, use curl in preference
  to wget, since curl is able to display only errors to stderr, unlike
  wget.

This does mean that downloadQuiet is only silent on stdout, not necessarily
on stderr, which affects a couple other calls of it. For example,
downloading the .git/config of a http remote may show an error message now,
perhaps with slightly suboptimal formatting due to other output.
2017-02-20 16:09:32 -04:00
Joey Hess
07de7c2c76
update 2017-02-20 15:44:43 -04:00
Joey Hess
302370d5c3
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-20 15:25:57 -04:00
Joey Hess
4a397b5313
Run wget with -nv instead of -q, so it will display HTTP errors.
This adds one extra line of output when a download is successful,
after the progress bar. I don't much like that, but wget does not provide a
way to show HTTP errors without it.
2017-02-20 15:25:02 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
2e2bc1895f removed 2017-02-20 19:07:55 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
15cf298271 Added a comment 2017-02-20 19:07:22 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
6728330b2c Added a comment 2017-02-20 19:06:58 +00:00
Joey Hess
3488679a81
comment 2017-02-20 14:49:03 -04:00
Joey Hess
221f62ea5e
comment 2017-02-20 14:37:59 -04:00
andrew
bfb38eecea Added a comment: the problem files 2017-02-20 18:11:03 +00:00
Joey Hess
a13c0ce66c
adjust: Fix behavior when used in a repository that contains submodules.
Also fixed the LsFiles parser to not assume its output has a fixed width
type field.
2017-02-20 13:44:55 -04:00
Joey Hess
5169f84f22
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-20 13:11:19 -04:00
Joey Hess
6e6a36fd5b
comment 2017-02-20 13:10:48 -04:00
Joey Hess
5d2e99a5ac
comment 2017-02-20 12:55:58 -04:00
Joey Hess
da207245f1
comment 2017-02-20 12:49:16 -04:00
Joey Hess
6ba8b557e8
remove
I've seen this thing, whatever it is, mentioned in spam links before,
so even if it's valid for some OS (probably not the one being asked
about), it's verboten here.
2017-02-20 12:24:15 -04:00
Joey Hess
d80cf5b9e9
comment 2017-02-20 12:23:22 -04:00
Joey Hess
c5cf5cf03a
git-annex.cabal: Make crypto-api a dependency even when built w/o webapp and test suite.
The p2p code made it always be needed.

This commit was sponsored by Anthony DeRobertis on Patreon.
2017-02-20 12:21:35 -04:00
Joey Hess
f31aadc7c2
comment 2017-02-20 12:17:09 -04:00
Joey Hess
74a942382d
comment 2017-02-20 12:07:20 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
76f4cde9cc 2017-02-20 08:12:10 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
27a40a97cd 2017-02-20 07:58:33 +00:00
openmedi
8c00d695aa Added a comment 2017-02-19 22:03:26 +00:00
m@2be305d83b52202ec4364229a836f463a6701336
2a9599c176 2017-02-19 19:03:24 +00:00
mhauru
f49066d9c6 2017-02-19 18:48:59 +00:00
openmedi
f339047be9 Added a comment 2017-02-19 15:27:08 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
a1e43697b6 2017-02-18 16:28:45 +00:00
openmedi
66c822b489 2017-02-18 13:42:45 +00:00
openmedi
475773a06b 2017-02-18 13:41:57 +00:00
Joey Hess
32782ab324
linkify 2017-02-17 15:58:32 -04:00
Joey Hess
4bc1e03bb7
devblog 2017-02-17 15:56:38 -04:00
Joey Hess
a700fdf5cf
documentation updates for new receive.denyCurrentBranch=updateInstead support
This commit was sponsored by andrea rota.
2017-02-17 15:43:16 -04:00
Joey Hess
d074532aff
post-recive hook to make updateInstead work in direct mode and adjusted branches
* Added post-recieve hook, which makes updateInstead work with direct
  mode and adjusted branches.
* init: Set up the post-receive hook.

This commit was sponsored by Fernando Jimenez on Patreon.
2017-02-17 14:04:43 -04:00
Joey Hess
de4d50e9d0
thoughts 2017-02-17 12:57:55 -04:00
Joey Hess
f36d789eef
comment 2017-02-17 12:36:23 -04:00
Joey Hess
e93d4bfa85
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-17 12:31:47 -04:00
yarikoptic
7fa1329877 initial whining 2017-02-17 15:30:32 +00:00
lasitus
ccdb4bdfa1 Added a comment 2017-02-17 03:23:46 +00:00
yarikoptic
2f601791bf 2017-02-17 01:57:11 +00:00
binx
54ce959986 2017-02-17 00:01:12 +00:00
Joey Hess
a2b848aba2
cleanup 2017-02-16 16:00:18 -04:00
JohnKozak
fa244ac433 removed 2017-02-16 18:45:41 +00:00
JohnKozak
b15ad04f33 Added a comment 2017-02-16 18:44:36 +00:00