Commit graph

27904 commits

Author SHA1 Message Date
Joey Hess
fda1175d32
comment 2016-05-23 13:00:49 -04:00
Joey Hess
80b86ff78d
fix recent test suite reversion
git annex adjust --force will overwrite any current adjusted branch.
I didn't document this because for the user, deleting the branch is just as
good.
2016-05-23 11:23:30 -04:00
Joey Hess
e394315b67
comment 2016-05-23 11:13:51 -04:00
Joey Hess
f8e71e1a52
Support building with ghc 8.0.1. 2016-05-23 11:13:14 -04:00
Joey Hess
8f1525e35b
fix test suite breakage 2016-05-23 11:06:36 -04:00
ilovezfs
fe944a96d3
git-annex: GHC compatibility 2016-05-23 11:02:34 -04:00
Joey Hess
0b7ed680f9
add more deps to Setuo-Depends
I'm told these are needed.
2016-05-23 10:52:55 -04:00
Joey Hess
464f06f5c6
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-23 10:50:18 -04:00
xloem
304c5ef17d 2016-05-23 11:01:25 +00:00
xloem
fbb955c7f2 2016-05-23 10:55:54 +00:00
ilovezfs
07383ae9ea 2016-05-23 06:31:12 +00:00
ilovezfs
724fe1a3d2 2016-05-23 06:27:46 +00:00
ilovezfs
da4d667940 Patches for GHC 8 and for cabal configure 2016-05-23 06:26:59 +00:00
rustikus@9db90d0c115a1825e2f1e5f15257ec1298a6c7b6
f499d6f052 Added a comment: Arrived in homebrew - Fix not working? 2016-05-22 19:58:33 +00:00
Joey Hess
d9368afa54
split out module to work around badly named symbol in directory-1.2.6.2
Sadly my bug report about this is not going to get fixed it seems, so
I have to drag around a whole added module file just to deal with it.

https://github.com/haskell/directory/issues/52
2016-05-22 15:51:31 -04:00
Joey Hess
6427b2866c
bump standards-version 2016-05-22 15:29:35 -04:00
Joey Hess
623fb4f9bb
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-22 15:08:27 -04:00
Joey Hess
097605e2e9
git's handing of relative GIT_INDEX_FILE is more insane than I thought; always make absolute
This is actually worse than I thought; when git is being run with a
detached work tree, GIT_INDEX_FILE is treated as a path relative to CWD,
instead of the normal behavior of relative the top of the work tree.

This seems to make it basically impossible for any program that wants to
use GIT_INDEX_FILE to use anything other than an absolute path to it; there
are too many configurations to keep straight that can change how git
interprets what should be a simple relative path to a file.

(I have complained to the git developers.)
2016-05-22 15:02:55 -04:00
xloem
a207886237 2016-05-22 17:09:49 +00:00
xloem
8a95bb14bc removed 2016-05-22 16:26:56 +00:00
xloem
79d335c806 Added a comment: This could be detected 2016-05-22 16:26:30 +00:00
xloem
c31b6c01ee Added a comment 2016-05-22 15:58:22 +00:00
Joey Hess
be03afac67
comment 2016-05-21 10:00:09 -04:00
Joey Hess
5d8cd16b27
comment 2016-05-21 09:53:44 -04:00
Joey Hess
fdb4fc9896
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-21 09:52:05 -04:00
Joey Hess
da0bfb9829
rename 2016-05-21 09:51:32 -04:00
xloem
f33d3b1d01 Added a comment: Retrieval progress message helpers 2016-05-20 19:42:24 +00:00
Joey Hess
9ac7e833cd
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-20 12:44:32 -04:00
ilovezfs@25b1c2e6e4c5194d062624bafc4507b8398d6588
bc87b2d9f9 S3 support lacking in a stock cabal install build in a sandbox on OS X 2016-05-20 10:33:02 +00:00
EskildHustvedt
41a5155b09 Added a comment 2016-05-20 07:45:52 +00:00
EskildHustvedt
f317ecb77b 2016-05-20 07:37:38 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
58bdc5be88 2016-05-19 19:11:14 +00:00
Gus
51ab43ca58 Added a comment: Thank you 2016-05-19 11:27:16 +00:00
xloem
57a7981e1b Added a comment: Freenet Special Remote 2016-05-19 03:02:19 +00:00
Joey Hess
823c28d2dc
nub transitionList to avoid ugly message after repeated transitions, and avoid redundant work for repeated ForgetDeadRemotes transitions 2016-05-18 12:26:38 -04:00
xloem
e86688651c Added a comment 2016-05-18 09:43:13 +00:00
xloem
fd23831467 Added a comment: dangling objects 2016-05-18 01:49:11 +00:00
Joey Hess
766728c8cf
unify handling of unusual GIT_INDEX_FILE relative path
This is probably a git bug that stuck in its interface.
2016-05-17 14:42:06 -04:00
Joey Hess
e81b1bc9e7
response 2016-05-17 14:13:21 -04:00
Joey Hess
8006ac923b
followup 2016-05-17 14:01:32 -04:00
Joey Hess
9492c8202b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-17 13:49:16 -04:00
Joey Hess
b4ab1fb093
Fix crash when entering/changing view in a subdirectory of a repo that has a dotfile in its root. 2016-05-17 13:49:10 -04:00
Joey Hess
e91037a38b
use indexEnv 2016-05-17 13:38:04 -04:00
Joey Hess
93c03b5dd5
Work around git bug in handling of relative path to GIT_INDEX_FILE when in a subdirectory of the repository.
This affected git annex view. It turns out that some other places
that use GIT_INDEX_FILE were already working around the bug. I removed the
workaround from Annex.Branch since the new workaround will do.
2016-05-17 13:29:51 -04:00
Gus
5efa21becc 2016-05-17 17:19:41 +00:00
adament@c0981cf9fb3a2c013811bae9af9bada8f0fa0886
b00ea72aec 2016-05-17 16:25:08 +00:00
adament@c0981cf9fb3a2c013811bae9af9bada8f0fa0886
9d2bb5bf5e 2016-05-17 16:23:54 +00:00
Gus
a4766d581b Added a comment: Restarting 2016-05-17 10:36:56 +00:00
openmedi
5595cc8c69 Added a comment 2016-05-16 23:11:34 +00:00
Joey Hess
27000d8af6
comment 2016-05-16 17:35:30 -04:00