Commit graph

35169 commits

Author SHA1 Message Date
Joey Hess
b90ee6dc52
test: Add pass using adjusted unlocked branch
On second thought, the extra time running the test suite is worth it.
It will be gained back once we finally get rid of direct mode.

There are two failing tests, same two that have been failing on windows
(though the failure does not look identical). So this should also spare me
the Windows VM while fixing.
2019-08-09 11:34:10 -04:00
Horus
d174feeb0f Added a comment 2019-08-09 07:51:07 +00:00
Lukey
aec95e48df Added a comment: HOWTO 2019-08-08 20:21:11 +00:00
Joey Hess
69a5b5a27f
bug report 2019-08-08 15:11:56 -04:00
Joey Hess
fbc270a3f0
disable 2 failing tests on windows
I have not tracked down why these fail on windows, but they
mostly test git-annex-shell anyway, and windows rarely acts as a
ssh server.
2019-08-08 14:58:40 -04:00
Joey Hess
57b24b2510
avoid pushing the special remote to origin
The sync is only to sync up the adjusted branch, not other info.
Since many tests use their own special remote named "foo",
the push broke later tests.
2019-08-08 14:33:46 -04:00
Joey Hess
298812a353
use separate main repo dir for each test suite pass
This way a failure to clean up the main repo dir from a previous pass
can't result in reusing that repo, which won't be configured right for the
current pass.
2019-08-08 14:29:28 -04:00
Joey Hess
70b71bf660
have init --version fail when repo is already initialized with other version
init: When the repo is already initialized, and --version requests a
different version, error out rather than silently not changing the version.
2019-08-08 14:13:02 -04:00
Joey Hess
65f34ffb4c
fix windows build 2019-08-08 13:41:56 -04:00
Joey Hess
022875274a
bug 2019-08-08 13:34:58 -04:00
Joey Hess
9e230cd448
work around adjusted unlocked branch problem in test suite 2019-08-08 13:28:04 -04:00
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