Commit graph

35808 commits

Author SHA1 Message Date
Joey Hess
aac0e187c5
don't test rsync special remote on windows
git-annex no longer ships with rsync on windows so this will generally
fail
2019-08-08 12:37:25 -04:00
Joey Hess
868942e19b
fix unused module import warnings when building on windows 2019-08-08 12:18:53 -04:00
Joey Hess
81ec673f9b
Merge branch 'master' of ssh://git-annex.branchable.com 2019-08-08 11:58:57 -04:00
Joey Hess
60d72df9c9
remove trailing comma 2019-08-08 11:58:38 -04:00
Ilya_Shlyakhter
5ceff99573 removed 2019-08-08 15:08:45 +00:00
Ilya_Shlyakhter
e1d97a92db removed 2019-08-08 15:05:48 +00:00
Ilya_Shlyakhter
8ce06e4a8f removed 2019-08-08 15:05:23 +00:00
Ilya_Shlyakhter
7421e214af Added a comment: Git for Windows installation -- support for symlinks 2019-08-08 15:04:40 +00:00
Ilya_Shlyakhter
8bf7a44293 Added a comment: Git for Windows installation -- support for symlinks 2019-08-08 15:04:32 +00:00
Ilya_Shlyakhter
ae4eade74e Added a comment: Git for Windows installation -- support for symlinks 2019-08-08 15:04:25 +00:00
Ilya_Shlyakhter
30c084f792 Added a comment: Git for Windows installation -- support for symlinks 2019-08-08 15:04:08 +00:00
Joey Hess
002bc7215d
only require fixed silently on windows 2019-08-07 18:04:29 -04:00
Joey Hess
7598cc6362
fixed 2019-08-07 18:00:49 -04:00
Joey Hess
3adc251f9d
Build with silently-1.2.5.1 on Windows; the old one used "NUL" which is not supported with recent versions of ghc. 2019-08-07 17:42:16 -04:00
Joey Hess
ec64a08b2b
Merge branch 'master' of ssh://git-annex.branchable.com 2019-08-07 14:05:32 -04:00
Joey Hess
8042ae7eaa
comment 2019-08-07 14:05:20 -04:00
Joey Hess
30ca02928c
Windows installer: Always install to 64 bit program files directory, since it needs 64 bit git now
I saw the installer not defaulting to any installation directory,
and I had to manually enter C:\Program Files\Git

Maybe it was choosing gitInstallDir32, and that was empty? Or the
conditional somehow failed. Simplifying so it will hopefully work again.
2019-08-07 14:05:03 -04:00
Joey Hess
bf5dd723d3
Fix querying git for object type when operating on a file containing newlines
This typo would make "git cat-file cat-file" fail, and the way it's used,
I think it broke querying all info from filenames containing newlines,
because the other queries are only run when it succeeds.
2019-08-07 13:35:42 -04:00
frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a
e3ef6db1a1 2019-08-07 11:03:10 +00:00
Horus
b20b4c3d4c 2019-08-07 08:33:41 +00:00
Joey Hess
ed6ed2e915
Merge branch 'master' of ssh://git-annex.branchable.com 2019-08-06 14:39:39 -04:00
Joey Hess
ee72fd2f7d
add exports useful if using this module to write a git-lfs server 2019-08-05 15:40:36 -04:00
Ilya_Shlyakhter
890a51485e Added a comment: similar bug report 2019-08-05 17:55:21 +00:00
Ilya_Shlyakhter
5e6a143740 Added a comment: issues with concurrent copy 2019-08-05 17:53:38 +00:00
Joey Hess
8938102896
devblog 2019-08-05 13:52:07 -04:00
Joey Hess
0dd6ba302e
close 2019-08-05 13:44:24 -04:00
Joey Hess
3e0770e800
Merge branch 'git-lfs' 2019-08-05 13:44:04 -04:00
Joey Hess
fb7d92457f
support using gcrypt with git-lfs special remote 2019-08-05 13:43:45 -04:00
Joey Hess
8401b09e32
Allow setting up a gcrypt special remote with encryption=shared
It was documented to work, but seems it has been broken for a
while/forever.
2019-08-05 12:41:05 -04:00
Joey Hess
c527ae5887
Merge branch 'master' into git-lfs 2019-08-05 11:48:45 -04:00
Joey Hess
3f450f0f4a
add encryption warning 2019-08-05 11:35:26 -04:00
Joey Hess
ecf7f34c23
remember sha256 and size when necessary
Using Logs.RemoteState for this means that if the same key gets uploaded
twice to a git-lfs remote, but somehow has different content the two
times (eg it's an URL key with non-stable content), the sha256/size of
the newer content uploaded will overwrite what was remembered before. That
seems ok; it just means that git-annex will request the newer version of
the content when downloading from git-lfs.

It will remember the sha256 and size if both are not known, or if only
the sha256 is not known but the size is known, it only remembers the
sha256, to avoid wasting space on the size. I did not add special case
for when the sha256 is known and the size is not, because it's been a
long time since git-annex created SHA256 keys without a size.
(See doc/upgrades/SHA_size.mdwn)
2019-08-05 11:05:59 -04:00
Joey Hess
87e9ed38b8
expand encryption warning 2019-08-05 10:43:51 -04:00
Joey Hess
922434bccc
remove extra blank line 2019-08-05 10:37:19 -04:00
Joey Hess
bf7da09cf6
update 2019-08-05 10:36:46 -04:00
Joey Hess
19defc7932
fix reversion
4af55c42bf reordered the exception
catching, preventing following ftp redirect
2019-08-04 14:32:06 -04:00
Joey Hess
f5eb28682a
expand 2019-08-04 13:59:24 -04:00
Joey Hess
8460bbcea9
note on git-lfs program 2019-08-04 13:16:59 -04:00
Joey Hess
c5ed11bc3f
documentation for git-lfs special remote 2019-08-04 13:15:47 -04:00
Joey Hess
408cb0af39
remove unused imports 2019-08-04 12:43:53 -04:00
Joey Hess
9aab851a55
fix reversion
lost check of resp_actions in b82ecf7076
2019-08-04 12:43:16 -04:00
Joey Hess
7269851550
download from LFS working
including resuming
2019-08-04 12:32:36 -04:00
Joey Hess
4af55c42bf
factored out downloadConduit from download
useful when an API provides a Request to download
2019-08-04 12:31:54 -04:00
david@8424c56b088b73b1f9bd7d0497ca9b5752776099
9108927b86 2019-08-03 22:42:50 +00:00
Joey Hess
b82ecf7076
verify that LFS server responds with requested object
The protocol design allows the server to respond with some other object;
if a server for some reason a server did that, it would not be right for
git-annex to download its content. I don't think it would be a security
hole, since git-annex is downloading a specific key and will verify the
key's content. Seems like a good idea to belt-and-suspenders test for
such a misuse of the protocol.
2019-08-03 16:23:47 -04:00
Joey Hess
28c0395d61
start at retieval from LFS
Doesn't yet download the content, which will need to support resuming.
2019-08-03 12:51:16 -04:00
Joey Hess
5be0a35dae
implemented checkPresent for git-lfs 2019-08-03 12:21:28 -04:00
Joey Hess
f536a0b264
weaken comment
I'm seeing the github lfs server request an upload of an object that has
already been uploaded to it before. Probably because they offload
storage to S3 and so skipped the overhead of checking for an unncessary
upload.
2019-08-03 11:31:02 -04:00
Joey Hess
a16e83eec8
also debug http response status code 2019-08-03 11:30:06 -04:00
Joey Hess
74e9e3ccf0
add to request headers, don't overwrite 2019-08-03 11:15:08 -04:00