Commit graph

29711 commits

Author SHA1 Message Date
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
102e04b30c
typo 2017-02-24 00:29:37 -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
3afc7d83f2
noCommit for PostReceive
This was noticed because it broke the datalad test suite, which pushed
to the remote and then fetched to check if it had received the expected
branches. Auto-init caused the git-annex branch on the remote to
diverge, breaking that test.

https://github.com/datalad/datalad/issues/1319#issuecomment-281649518

The auto-init still happens, it's staged in the journal, and will be
commited by some later git-annex command when it runs. Which is fine,
it's the same as that later command doing the auto-init.

This commit was supported by the NSF-funded DataLad project
2017-02-23 18:37:02 -04: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
Joey Hess
3af9f5ed1a
remove Build/SysConfig.hs target
The problem with that target was, if a target like git-annex that
depended on it failed for some reason, make would delete
Build/SysConfig.hs, since it knows it's an intermediate file. But, since
stack only builds that file once, that caused all subsequent make git-annex
builds to fail.

Also, this avoids a double stack build when building with stack. Since
stack has no configure stage, and the Build/SysConfig.hs target was
about running the configure stage, the only way to only build once is to
combine the targets like this.

This should work better on the autobuilders that build with stack.

This commit was sponsored by NSF-funded DataLad project
2017-02-21 13:55:41 -04: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
8dd3635acf
improve layout 2017-02-20 15:44:14 -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
35915a30d5
mention GIT_SSH_COMMAND 2017-02-20 12:58:08 -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