Commit graph

27980 commits

Author SHA1 Message Date
Joey Hess
2b9281164f
response 2016-05-31 11:58:38 -04:00
Joey Hess
110b3acd43
response 2016-05-31 11:55:00 -04:00
uwe.nagler@9f80ad68e498fcdb09e20b17ff4539f94ef73ea9
49f538712f Added a comment: subdirectories above FILEKEY directory 2016-05-31 11:51:56 +00:00
gernot
17b28c5ca6 2016-05-29 13:10:19 +00:00
xloem
25b92a1597 Added a comment 2016-05-29 02:02:38 +00:00
NhanHo
c1f4b9fab8 2016-05-28 06:02:16 +00:00
felixonmars@643c7c1f0bf9bace16d293d69b51419f012234d1
177376dc79 2016-05-28 03:23:10 +00:00
Joey Hess
16e987be01
devblog 2016-05-27 15:37:01 -04:00
Yaroslav Halchenko
97746c80b3
minor typos in devblog 2016-05-27 15:26:34 -04:00
Joey Hess
84f20c9f69
Windows: Avoid terminating git-annex branch lines with \r\n when union merging. 2016-05-27 15:22:52 -04:00
Joey Hess
45308ec78b
Improve SHA*E extension extraction code.
Filter out over-long "extensions" before stripping out non-alphanumerics
from them, so that eg "foo.ba__________r" is not considered a .bar
extension.
2016-05-27 13:14:51 -04:00
Joey Hess
d2fa4a6873
rename function 2016-05-27 13:10:23 -04:00
Joey Hess
b7d47741c9
comment 2016-05-27 13:09:46 -04:00
Joey Hess
be4e2027e8
add news item for git-annex 6.20160527 2016-05-27 12:36:46 -04:00
Joey Hess
f21a425791
releasing package git-annex version 6.20160527 2016-05-27 12:35:18 -04:00
Joey Hess
593837c70e
add Logs.Line 2016-05-27 12:15:01 -04:00
Joey Hess
176cd98293
remove \r from Arbitrary for log tests 2016-05-27 12:04:49 -04:00
Joey Hess
5418c8a23a
prep release 2016-05-27 11:50:27 -04:00
Joey Hess
abaeb517eb
comment 2016-05-27 11:46:24 -04:00
Joey Hess
eba68572dc
Split lines in the git-annex branch on \r as well as \n, to deal with \r\n terminated lines written by some versions of git-annex on Windows.
This fixes strange displays in some cases, including whereis showing
many duplicate locations, and showing more total copies than actually
exist.

It's unknown if that lead to data loss when eg, dropping. At the moment,
it seems unlikely it could, since the UUID with \r's appended is not the
same as a UUID without, and so no remote matches it.

It's also unknown if \r's can leak in on windows, perhaps when merging the
git-annex branch.
2016-05-27 11:45:13 -04:00
Joey Hess
f4db181d9b
fix warning 2016-05-27 11:15:52 -04:00
Joey Hess
4e0af0e3e8
followup 2016-05-27 11:05:53 -04:00
Joey Hess
0c2c9202d7
followup 2016-05-27 11:01:33 -04:00
Joey Hess
9a0a75182b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-27 10:40:08 -04:00
Joey Hess
0e33730b5a
analysis 2016-05-27 10:39:55 -04:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
a7d83f92f6 Added a comment: GHC HEAD warnings 2016-05-27 14:21:11 +00:00
Joey Hess
35b1130a8f
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-27 10:19:17 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ae9f6b5dd4 2016-05-25 18:30:34 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e92d36ddb2 just added a tag to claim my ownership 2016-05-25 12:59:57 +00:00
xloem
2040cb9a61 2016-05-25 12:25:31 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e6bffbdf08 Added a comment 2016-05-25 01:09:56 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
f2327ef7b0 closing 2016-05-25 00:28:36 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
8c6067d96f 2016-05-25 00:25:03 +00:00
Joey Hess
5b5b1e33bc
update copyright year 2016-05-24 17:44:36 -04:00
Joey Hess
714750e593
include 3 in upgradableVersions
Does not change behavior, only git annex version output
2016-05-24 17:13:19 -04:00
Joey Hess
2b7b2c4136
only warn about missing dbus support on linux 2016-05-24 16:51:10 -04:00
Joey Hess
bbe42999ae
devblog 2016-05-24 16:08:43 -04:00
Joey Hess
7b61c7f5d0
temporarily add cabal.config to support ghc 8.0.1 build
This commit can be reverted once the library deps are worked out upstream.
2016-05-24 16:06:27 -04:00
Joey Hess
d815bb8635
close 2016-05-24 16:06:24 -04:00
Joey Hess
a533cc3b35
close 2016-05-24 16:00:39 -04:00
Joey Hess
1183205838
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-24 15:59:22 -04:00
Joey Hess
1b3bde0625
enableremote: Remove annex-ignore configuration from a remote. 2016-05-24 15:58:27 -04:00
Joey Hess
b33a649a25
enableremote: Can now be used to explicitly enable git-annex to use git remotes. Using the command this way prevents other git-annex commands from probing new git remotes to auto-enable them. 2016-05-24 15:24:38 -04:00
Joey Hess
afb332a142
replace redudundant and incomplete encryption para with link 2016-05-24 14:38:59 -04:00
NhanHo
bd8e8ebd07 2016-05-24 13:15:56 +00:00
NhanHo
eab26c79c3 2016-05-24 10:39:34 +00:00
ilovezfs
c4cd0c8730 Added a comment 2016-05-24 09:32:31 +00:00
NhanHo
f6cded63e9 2016-05-24 09:08:35 +00:00
NhanHo
b18f0f55b6 2016-05-24 09:07:18 +00:00
myannex@18bb16ff5a145a744e065dc96ed566d7a236ccbc
b88ed4dba9 2016-05-24 06:02:09 +00:00