Commit graph

37765 commits

Author SHA1 Message Date
Joey Hess
a88b671bd9
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-02 14:17:31 -04:00
Joey Hess
caaeba0be9
thoughts 2020-07-02 14:15:47 -04:00
yarikoptic
1d51db3b02 Added a comment: more ideas for async implementation 2020-07-02 17:44:44 +00:00
Joey Hess
df168e3513
avoid running test on windows
It's failed for a long time in the autobuilder environment, and
currently it seems to be hanging.
2020-07-02 13:40:00 -04:00
Joey Hess
f912f8e5fd
refix bug in a better way
Always run Git.Config.store, so when the git config gets reloaded,
the override gets re-added to it, and changeGitRepo then calls extractGitConfig
on it and sees the annex.* settings from the override.

Remove any prior occurance of -c v and add it to the end. This way,
-c foo=1 -c foo=2 -c foo=1 will pass -c foo=1 to git, rather than -c foo=2

Note that, if git had some multiline config that got built up by
multiple -c's, this would not work still. But it never worked because
before the bug got fixed in the first place, the -c value was repeated
many times, so the multivalue thing would have been wrong. I don't think
-c can be used with multiline configs anyway, though git-config does
talk about them?
2020-07-02 13:32:33 -04:00
Joey Hess
ec0f8a6e74
Fix reversion that broke passing git configs with -c
Reverting commit c8fec6ab0
2020-07-02 12:42:13 -04:00
Joey Hess
1ecf6d239e
fix windows build 2020-07-02 12:18:42 -04:00
Joey Hess
0b5515899b
comment 2020-07-02 12:18:02 -04:00
Joey Hess
0f26782a73
fix windows build more 2020-07-02 12:01:09 -04:00
Joey Hess
00497fd38e
fix windows build 2020-07-02 11:46:26 -04:00
Joey Hess
8ad433d5f0
fix windows build 2020-07-02 11:35:05 -04:00
Joey Hess
b2f4b84d27
clean up some build warnings on windows 2020-07-02 11:34:18 -04:00
Joey Hess
b54bf31eb7
Revert "remove .stack-work"
This reverts commit e930237f61.

Unbelievably, that worked, somehow the preprocessed file had gotten
cached from the wrong version. Windows has found a new way to amaze me in
its horribleness.
2020-07-02 11:29:24 -04:00
Joey Hess
e930237f61
remove .stack-work
build is failing on commit d409f92318
but the error message quotes a version of Utility/Process/Transcript.hs
before a fix yesterday. All I can think is stack may have cached the old
version, perhaps after cpp?
2020-07-02 11:16:05 -04:00
Joey Hess
fe1f4632a4
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-02 10:00:11 -04:00
B
d409f92318 Added a comment: Workaround 2020-07-02 12:51:41 +00:00
Joey Hess
087b7ee66a
Revert "data type that starts off using a set but converts to a bloom filter when large"
This reverts commit 7e2c4ed216.

I was not able to use this in the end..
See comment in the previous commit.
2020-07-01 20:12:19 -04:00
Joey Hess
00c9eb4c78
comment 2020-07-01 20:12:10 -04:00
Ilya_Shlyakhter
d03902f7ff Added a comment: annex.thin for importing from directory special remote 2020-07-01 22:23:58 +00:00
http://templeofcrom.duckdns.org/
98b3d31b95 Added a comment 2020-07-01 21:54:49 +00:00
Joey Hess
38c0057cc6
fix build on windows 2020-07-01 16:53:50 -04:00
Lukey
5a64acf790 Added a comment 2020-07-01 20:37:13 +00:00
Joey Hess
117bd04693
more details 2020-07-01 16:20:37 -04:00
Ilya_Shlyakhter
afc705f7c8 Added a comment: adding files also fails 2020-07-01 19:51:34 +00:00
Ilya_Shlyakhter
2db76f8144 added bug report about git-annex-init on a repo in VirtualBox shared folder 2020-07-01 19:39:14 +00:00
Joey Hess
a09937580e
more windows build fixes 2020-07-01 15:22:56 -04:00
Joey Hess
640dbaaaf8
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-01 15:15:47 -04:00
Joey Hess
11c2886578
overlapping todos 2020-07-01 15:06:36 -04:00
Ilya_Shlyakhter
bc9c7c3b2c question about building the standalone distribution 2020-07-01 18:53:07 +00:00
Joey Hess
7e1e2962d2
build warnings 2020-07-01 14:30:08 -04:00
Joey Hess
7e2c4ed216
data type that starts off using a set but converts to a bloom filter when large
This adds a dep on hashable, but it's a free dependency, since
unordered-containers already pulled it in.

Using unordered-containers for the set seems to make sense, since it
hashes and bloom filter hashes too. (Though different hashes.)
I dunno, never quite know if I should use unordered-containers or containers.
2020-07-01 14:06:12 -04:00
Ilya_Shlyakhter
d1232e385b Added a comment 2020-07-01 17:33:49 +00:00
Ilya_Shlyakhter
6eb318cd53 Added a comment: git pack files 2020-07-01 17:32:45 +00:00
Joey Hess
424b1912d6
followup and add link 2020-07-01 12:28:44 -04:00
Joey Hess
a496ab602d
todo 2020-07-01 12:07:11 -04:00
Joey Hess
ead8afe2f3
comment 2020-07-01 11:38:44 -04:00
Joey Hess
07dff32bd4
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-01 11:23:39 -04:00
Joey Hess
d3d187c869
fix build on windows
Annex.GitOverlay was using a module that needs posix to build.
2020-07-01 11:22:15 -04:00
http://templeofcrom.duckdns.org/
282f63d4ed Added a comment 2020-07-01 15:03:08 +00:00
Lukey
ffb03cc959 Added a comment 2020-07-01 14:32:12 +00:00
https://bmwiedemann.zq1.de/
e3d091f12c Added a comment 2020-07-01 02:47:05 +00:00
Joey Hess
98a8a6da81
todo 2020-06-30 18:41:47 -04:00
kyle
9bd56b5494 Added a comment 2020-06-30 21:24:56 +00:00
Joey Hess
33c26988f6
comment 2020-06-30 17:21:17 -04:00
Joey Hess
4af5fc3505
fixed oops 2020-06-30 17:16:29 -04:00
Joey Hess
3935ce8be5
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-30 17:15:31 -04:00
Joey Hess
761252ce5f
fix stack file syntax and deps
In stack-lts-12.14.yaml, there were dep issues using the new libraries,
which may not be resolvable with those old versions. Didn't check, just
disabled using the libraries there, which will hold us for a couple
years.

(It would probably be easy enough to relax some of the dep versions in
http-client-restricted and git-lfs to the older versions.)
2020-06-30 17:12:23 -04:00
Joey Hess
8f508d4406
comments 2020-06-30 16:41:31 -04:00
Joey Hess
5891e10409
bug report 2020-06-30 16:40:08 -04:00
https://bmwiedemann.zq1.de/
814698bd53 Added a comment 2020-06-30 19:47:35 +00:00