summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Avoid backtraces on expected failures when built with ghc 8; only use ↵Gravatar Joey Hess2016-11-15
| | | | | | | | | | | | | backtraces for unexpected errors. ghc 8 added backtraces on uncaught errors. This is great, but git-annex was using error in many places for a error message targeted at the user, in some known problem case. A backtrace only confuses such a message, so omit it. Notably, commands like git annex drop that failed due to eg, numcopies, used to use error, so had a backtrace. This commit was sponsored by Ethan Aubin.
* fix tricky warning with ghc 8Gravatar Joey Hess2016-11-15
| | | | | Whether Route was exported from Assistant.WebApp.Types or not depended on the version of ghc. So, explictly export it.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-15
|\
* | sync: Pass --allow-unrelated-histories to git merge when used with git git ↵Gravatar Joey Hess2016-11-15
| | | | | | | | | | | | | | | | | | | | | | | | 2.9.0 or newer. This makes merging a remote into a freshly created direct mode repository work the same as it works in indirect mode. The git-annex branches would get merged in any case by a sync, since that doesn't use git merge. This might need to be revisited later to better mirror git's behavior.
| * Added a commentGravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-11-15
|/
* unbreak all the autobuildersGravatar Joey Hess2016-11-15
| | | | | | | | | | git-annex.cabal: Loosen bounds on persistent to allow 2.5, which on Debian has been patched to work with esqueleto. This may break cabal's resolver on non-Debian systems; if so, either use stack to build, or run cabal with --constraint='persistent ==2.2.4.1' Hopefully this mess with esqueleto will be resolved soon. https://github.com/prowdsponsor/esqueleto/issues/137
* closeGravatar Joey Hess2016-11-15
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-15
|\
| * Added a commentGravatar christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb2016-11-15
| |
| * Added a comment: "Hmm, guyz? Are you serious with these scripts?" Well, ↵Gravatar https://launchpad.net/~stephane-gourichon-lpad2016-11-15
| | | | | | | | what's the matter?
| * (no commit message)Gravatar thowz2016-11-15
| |
* | local lan detectionGravatar Joey Hess2016-11-14
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-14
|\
* | devblogGravatar Joey Hess2016-11-14
| |
* | no-xmpp branchGravatar Joey Hess2016-11-14
| |
* | updated designGravatar Joey Hess2016-11-14
| | | | | | | | more details on using tor and pairing
| * Added a comment: same on DebianGravatar gfa@1e86118cd41fbfea50004af221471ad97b55af182016-11-14
| |
| * (no commit message)Gravatar neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd2016-11-14
| |
| * Added a commentGravatar neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd2016-11-13
| |
| * Added additional comment about it working if I build from sourceGravatar mail@de3e4e58ccb420b8d9b78ef262ee0c80e021f1992016-11-13
| |
| * (no commit message)Gravatar mail@de3e4e58ccb420b8d9b78ef262ee0c80e021f1992016-11-13
| |
| * (no commit message)Gravatar mail@4e627fd997ef5ca9f75e62ffc0aba5b27bd6aea12016-11-12
| |
| * (no commit message)Gravatar https://tribut.de/2016-11-12
|/
* add news item for git-annex 6.20161111Gravatar Joey Hess2016-11-11
|
* releasing package git-annex version 6.201611116.20161111Gravatar Joey Hess2016-11-11
|
* Linux standalone: Avoid using hard links in the tarball so it can be ↵Gravatar Joey Hess2016-11-10
| | | | untarred on eg, afs which does not support them.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-10
|\
* | commentGravatar Joey Hess2016-11-10
| |
| * (no commit message)Gravatar luckcolorsgoo@ab4f3c1c44a7dbcbcb9d9a29315b59ad524ceaaa2016-11-10
| |
| * (no commit message)Gravatar luckcolorsgoo@ab4f3c1c44a7dbcbcb9d9a29315b59ad524ceaaa2016-11-10
|/
* webapp: Explicitly avoid checking for auth in static subsite requests.Gravatar Joey Hess2016-11-10
| | | | | | | | Yesod didn't used to do auth checks for that, but this may have changed. I don't have a way to reproduce the reported problem yet, but this change certianly won't hurt anything. This commit was sponsored by Thom May on Patreon.
* Added a commentGravatar openmedi2016-11-10
|
* Added a commentGravatar christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb2016-11-10
|
* (no commit message)Gravatar christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb2016-11-10
|
* prefer per-user, fix ExecStart syntaxGravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-11-10
|
* (no commit message)Gravatar jesrui@51c25da8d6f34e6df8e3e7ed0277335ed7ddf6a62016-11-10
|
* Added a comment: Android 6/7?Gravatar lykos@d125a37d89b1cfac20829f12911656c40cb700182016-11-09
|
* Added a comment: not specific to cloud repoGravatar public@881708f3cb16d1f967ca9f517a310dd2114740132016-11-09
|
* Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-11-08
|
* mehGravatar Joey Hess2016-11-08
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-08
|\
* | closeGravatar Joey Hess2016-11-08
| |
| * initial whiningGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-11-08
| |
| * Added a comment: joey's test build fixes issueGravatar public@881708f3cb16d1f967ca9f517a310dd2114740132016-11-08
|/
* Added a commentGravatar Euxane2016-11-08
|
* (no commit message)Gravatar Euxane2016-11-08
|
* (no commit message)Gravatar public@881708f3cb16d1f967ca9f517a310dd2114740132016-11-08
|
* (no commit message)Gravatar ddenis2016-11-07
|
* (no commit message)Gravatar ddenis2016-11-07
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-07
|\