Joey Hess
1dcfd797fa
fix git version
2016-06-02 15:55:11 -04:00
Joey Hess
69bf128f76
avoid switching to direct mode in clone of adjusted branch repo
2016-06-02 15:36:52 -04:00
Joey Hess
72f0d3d384
Automatically enable v6 mode when initializing in a clone from a repo that has an adjusted branch checked out.
...
The clone also has the adjusted branch checked out, so it needs to be
initialized to a version that supports that.
2016-06-02 15:34:30 -04:00
Joey Hess
02a20288ef
Pass -S to git commit-tree when commit.gpgsign is set and when making a non-automatic commit, in order to preserve current behavior when used with git 1.9, which has stopped doing this itself.
2016-06-02 15:07:20 -04:00
Joey Hess
155b221e51
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-02 14:48:25 -04:00
gernot
8e247a018c
Added a comment
2016-06-02 18:34:00 +00:00
Joey Hess
b271a417e6
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-02 14:10:39 -04:00
Dilyin
85b5f1e6a0
Added a comment
2016-06-02 18:10:33 +00:00
Joey Hess
fbf5045d4f
sync --content: Fix bug that caused transfers of files to be made to a git remote that does not have a UUID. This particularly impacted clones from gcrypt repositories.
...
Added guard in Annex.Transfer to prevent this problem at a deeper level.
I'm unhappy ith NoUUID, but having Maybe UUID instead wouldn't help either
if nothing checked that there was a UUID. Since there legitimately need to
be Remotes that do not have a UUID, I can't see a way to fix it at the type
level, short making there be two separate types of Remotes.
2016-06-02 13:50:43 -04:00
Joey Hess
abf28714c3
update
2016-06-02 13:20:27 -04:00
Joey Hess
eff6e8b1f7
analysis
2016-06-02 13:20:14 -04:00
chris@f4ea67aa5ae4709d79959f782fcebb5edae9a79b
7dfcfe3708
Added a comment: similar problem
2016-06-02 16:28:18 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2019cc5b65
fixed up done tag
2016-06-02 15:37:15 +00:00
Yaroslav Halchenko
64e844e1fe
minor typo fixes throughout
...
problematic
flexibility
2016-06-02 11:22:18 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
842f8da6b7
fixed typo and commented about replication
2016-06-02 13:02:42 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
67aea97b7d
2016-06-02 03:49:26 +00:00
Joey Hess
4fd28807c1
todo
2016-06-01 23:35:08 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e0ef8f2abb
2016-06-02 02:35:19 +00:00
Dilyin
456fe90b25
Added a comment: Special remote's annex cost
2016-06-01 18:44:15 +00:00
Dilyin
8f9e7f25b5
Added a comment: Retroactively annex
2016-06-01 18:36:40 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
b9c4468596
2016-06-01 10:03:52 +00:00
Joey Hess
f4489cc415
Remove Makefile from cabal tarball; man page building is now handled by a small haskell program.
...
This actually runs faster than building the man pages from the makefile
did. But the main purpose is to let Setup.hs import Build.Mans and so not
need the makefile.
2016-05-31 13:58:13 -04:00
felixonmars@643c7c1f0bf9bace16d293d69b51419f012234d1
056a7f67a8
Added a comment
2016-05-31 16:36:05 +00:00
Joey Hess
010dc21f00
response
2016-05-31 12:21:13 -04:00
Joey Hess
3426bae807
followup
2016-05-31 12:17:50 -04:00
Joey Hess
2a7df4f6d9
response
2016-05-31 12:01:45 -04:00
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
