aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2018-02-19
|\
* | split msg into linesGravatar Joey Hess2018-02-19
| | | | | | | | | | | | msg is what would be output to stderr, so has some layout and formatting, which is perhaps not ideal, but let's at least avoid it containing line breaks.
* | updateGravatar Joey Hess2018-02-19
| |
* | wordingGravatar Joey Hess2018-02-19
| |
* | fix buildGravatar Joey Hess2018-02-19
| |
* | better doc for --json-error-messagesGravatar Joey Hess2018-02-19
| | | | | | | | Word so warnings can be included, not only errors.
* | send stderr to json when --json-error-messages enabledGravatar Joey Hess2018-02-19
| |
* | always include error-messages field when --json-error-messagesGravatar Joey Hess2018-02-19
| | | | | | | | | | | | | | | | | | Always include error-messages field, even if empty, to make the json be self-documenting. This was a design requirement for --json-error-messages. This commit was supported by the NSF-funded DataLad project.
* | add --json-error-messages (not yet implemented)Gravatar Joey Hess2018-02-19
| | | | | | | | | | | | | | | | | | | | Added --json-error-messages option, which includes error messages in the json output, rather than outputting them to stderr. The actual rediretion of errors is not implemented yet, this is only the docs and option plumbing. This commit was supported by the NSF-funded DataLad project.
* | fix --json-progress --json to be same as --json --json-progressGravatar Joey Hess2018-02-19
| | | | | | | | | | | | | | Fix behavior of --json-progress followed by --json, in which the latter option disabled the former. This commit was supported by the NSF-funded DataLad project.
| * Added a comment: I can reproduceGravatar olaf2018-02-19
|/
* Split Test.hs and avoid optimising it much, to need less memory to compile.Gravatar Joey Hess2018-02-18
| | | | | | | | The ghc options were found by Sean Whitton; the debian arm autobuilders need those to build w/o OOM, and it seems to involve llvm using too much memory to optimize Test. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
* git-annex.cabal: Once more try to not build the assistant on the hurd, ↵Gravatar Joey Hess2018-02-18
| | | | | | hopefully hackage finally recognises that OS. Last try was in 2015 https://github.com/haskell/hackage-server/issues/269
* Added a commentGravatar ericm2018-02-18
|
* (no commit message)Gravatar michalrus2018-02-17
|
* Added a commentGravatar yarikoptic2018-02-16
|
* commentGravatar Joey Hess2018-02-16
|
* updateGravatar Joey Hess2018-02-16
|
* commentGravatar Joey Hess2018-02-16
|
* commentGravatar Joey Hess2018-02-16
|
* --json: multi-line notesGravatar Joey Hess2018-02-16
| | | | | | | | | | | --json: When there are multiple lines of notes about a file, make the note field multiline, rather than the old behavior of only including the last line. Using newlines in the note is perhaps not ideal, but upgrading it to an array in this case would be an annoying inconsistency to need to deal with. This commit was sponsored by Ole-Morten Duesund on Patreon.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2018-02-15
|\
* | Add gpg-agent to Build-Depends. Needed to run the test suite.Gravatar Joey Hess2018-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged from Debian. I think what this actually deals with is the case where gpg is installed, but gpg-agent is not, since Utility.Gpg.stdParams enables --use-agent when GPG_BATCH is set, and the test suite enables GPG_BATCH. So, test suite will work with gpg not installed, or with both gpg and gpg-agent installed, but not with only gpg. For this reason, I've also put in an explicit dep on gnupg, although dpkg-dev recommends it and all debian package builds tend to have it available implicitly.
| * add wishlist item "creating importfeed does not work with socks proxy"Gravatar https://christian.amsuess.com/chrysn2018-02-14
| |
| * Added a commentGravatar ericm2018-02-11
| |
| * Added a commentGravatar yarikoptic2018-02-10
| |
| * (no commit message)Gravatar yarikoptic2018-02-10
|/
* use BreaksGravatar Joey Hess2018-02-09
|
* Adjusted debian/patches/standalone-build for changes in controlGravatar Yaroslav Halchenko2018-02-09
|
* (no commit message)Gravatar achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c82018-02-09
|
* (no commit message)Gravatar achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c82018-02-09
|
* (no commit message)Gravatar achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c82018-02-09
|
* (no commit message)Gravatar achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c82018-02-09
|
* optimise for case where there are no required contentsGravatar Joey Hess2018-02-08
| | | | Avoid reading location log in this case.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2018-02-08
|\
* | fsck: Warn when required content is not present in the repository that ↵Gravatar Joey Hess2018-02-08
| | | | | | | | | | | | requires it. This commit was sponsored by Jack Hill on Patreon.
| * Added a commentGravatar yarikoptic2018-02-08
| |
* | rewrap to fix man page formatGravatar Joey Hess2018-02-08
|/
* commentGravatar Joey Hess2018-02-08
|
* commentGravatar Joey Hess2018-02-08
|
* responseGravatar Joey Hess2018-02-08
|
* commentGravatar Joey Hess2018-02-08
|
* devblogGravatar Joey Hess2018-02-07
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2018-02-07
|\
* | datalad < 0.9.1 had a problem in its special remote protocol handling which ↵Gravatar Joey Hess2018-02-07
| | | | | | | | is broken by EXTENSIONS. Make the debian git-annex package conflict with the problem version of datalad.
* | Merge branch 'EXTENSIONS'Gravatar Joey Hess2018-02-07
|\ \
| | * Added a commentGravatar yarikoptic2018-02-07
| |/ |/|
* | commentGravatar Joey Hess2018-02-07
| |
| * Added EXTENSIONS to external special remote protocol.Gravatar Joey Hess2018-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows using new special remote messages when git-annex supports them, and avoiding using them when git-annex is too old. The new INFO is one such message. There's also the possibility, currently unused, for the special remote's reply to include some kind of extensions of its own. Merging this is blocked by https://github.com/datalad/datalad/issues/2124 since it seems it will break datalad. I checked all the other special remotes and they will be ok. This commit was supported by the NSF-funded DataLad project.
* | Added a commentGravatar yarikoptic2018-02-07
|/