Commit graph

37523 commits

Author SHA1 Message Date
Joey Hess
fde6099c59
dix original branch determation when testing adjusted branches 2020-06-23 17:41:50 -04:00
Joey Hess
86968e366c
open bug 2020-06-23 17:07:46 -04:00
Joey Hess
b651d3ede0
test: Fix some test cases that assumed git's default branch name
git is making that configurable, and configuring it globally would break
the test suite in a few places.

No other part of git-annex assumes any branch name. Renamed a few
placeholders to make that clearer.

This commit was sponsored by Jake Vosloo on Patreon.
2020-06-23 16:40:51 -04:00
Joey Hess
a364effc02
comment 2020-06-23 16:22:34 -04:00
Joey Hess
ed69f50361
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-23 16:08:53 -04:00
Joey Hess
7757c0e900
Honor annex.largefiles when importing a tree from a special remote.
This commit was sponsored by Martin D on Patreon.
2020-06-23 16:07:18 -04:00
Joey Hess
1c1edad620
encoding a git sha as a git-annex key
This is a bijective mapping, and is distinct from SHA1.

As git transitions away from sha1, this could contain whatever hash
git uses.
2020-06-23 14:25:39 -04:00
Joey Hess
d045e39058
thoughts 2020-06-23 14:14:13 -04:00
Joey Hess
3da4caa785
thoughts 2020-06-23 13:51:10 -04:00
kyle
db6a06c55c Added a comment 2020-06-23 13:29:41 +00:00
ubermonk@47e490d382daa4f97abfdabb6d97c86f5fcb1f8f
69c321b8d7 created new thread 2020-06-22 23:12:11 +00:00
ghen1
390d5a36ac 2020-06-22 20:55:35 +00:00
ghen1
74123f26ad Added a comment 2020-06-22 20:40:11 +00:00
Joey Hess
400b03115e
close 2020-06-22 14:46:02 -04:00
Joey Hess
b97d8030f3
respond and close 2020-06-22 14:44:14 -04:00
Joey Hess
e2f739b0c8
comment and close 2020-06-22 14:38:09 -04:00
Joey Hess
b904748ee3
guess yoh meant projects/datalad here, not projects/yoh 2020-06-22 14:26:33 -04:00
Joey Hess
5098236c6b
testremote: Fix over-allocation of resources and bad caching
Including starting up a large number of external special remote processes.
(Regression introduced in version 8.20200501)
2020-06-22 14:25:49 -04:00
Joey Hess
10db6c7a41
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-22 11:33:14 -04:00
Joey Hess
104b3a9c6a
Build with the http-client-restricted library when available
Otherwise use the vendored copy as before.

The library is in Debian testing but not stable. Once it reaches
stable, the vendored copy can be removed.

Did not add it to debian/control because IIRC that's used to build
git-annex on stable too, possibly. However, the Debian maintainer will
probably want to make the package depend on libghc-http-client-restricted-dev

This commit was sponsored by Ilya Shlyakhter on Patreon.
2020-06-22 11:31:31 -04:00
Joey Hess
01eb863a14
Build with the git-lfs library when available
Otherwise use the vendored copy as before.

The library is in Debian testing but not stable. Once it reaches
stable, the vendored copy can be removed.

Did not add it to debian/control because IIRC that's used to build
git-annex on stable too, possibly. However, the Debian maintainer will
probably want to make the package depend on libghc-git-lfs-dev.

This commit was sponsored by Ilya Shlyakhter on Patreon.
2020-06-22 11:21:25 -04:00
Joey Hess
aa1ad0b7ca
remove redundant imports
Clean build under ghc 8.8.3, which seems to do better at finding cases
where two imports both provide the same symbol, and warns about one of
them.

This commit was sponsored by Ilya Shlyakhter on Patreon.
2020-06-22 11:05:34 -04:00
Joey Hess
6ef62cb3c7
fix unused import warning
Network.HTTP.Client exports makeConnection since 0.5.3.

Debian stable has a newer version than 0.5.3, so bumping the
min version seems better than adding an ifdef.
2020-06-22 10:55:37 -04:00
http://templeofcrom.duckdns.org/
abc2d3c2cb Added a comment: initremote type=web 2020-06-21 02:24:09 +00:00
ink
a6fffac9ae 2020-06-20 10:45:24 +00:00
yarikoptic
6491691801 initial report on breed of children processes by testremote 2020-06-19 20:41:21 +00:00
OE_Sunil
4637c5a37e Added a comment: Error on startup after uninstalling Git-Annex 2020-06-19 09:32:14 +00:00
Franky
b656c0853f 2020-06-19 02:16:19 +00:00
Franky
f25c69087c removed 2020-06-19 02:12:05 +00:00
Franky
0b5d1e17b0 removed 2020-06-19 02:10:29 +00:00
Franky
47bffd3357 2020-06-18 22:57:36 +00:00
Franky
549c9b1e0b 2020-06-18 22:54:03 +00:00
Franky
3385d7bbeb 2020-06-18 22:50:22 +00:00
Franky
a27798c35f 2020-06-18 22:48:59 +00:00
yarikoptic
775c1cb032 Added a comment 2020-06-18 19:17:27 +00:00
Joey Hess
4c44deb2cd
improve cabal v2 use
cabal exec in v2 puts the built binary in PATH, so can just ask where it
is that way, and symlink it

And cabal exec hothasktags simplifies running that, because it sets up
most of the necessary environment.

The tags and TAGS targets now need cabal v2 to work.
2020-06-18 13:56:03 -04:00
Joey Hess
22ac56fece
test suite passing 2020-06-18 13:55:32 -04:00
Joey Hess
d5451afc8f
fix deadlock
Fix a deadlock that could occur after git-annex got an unlocked file,
causing the command to hang indefinitely.

Known to happen on vfat filesystems, possibly others.

Note that a deadlock is still theoretically possible, if anything
smudge --clean does causes it to run the git queue for some other
reason.

Apparently that doesn't happen, but will need to keep an eye on it.
2020-06-18 12:56:29 -04:00
Joey Hess
82381211fa
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-18 12:26:30 -04:00
Joey Hess
45cc727263
ignore cabal.project.local~
cabal creates this if it overwrites the file
2020-06-18 12:25:47 -04:00
Franky
852dae987f Added a comment 2020-06-18 16:17:39 +00:00
Joey Hess
348821c9cf
analysis of deadlock 2020-06-18 12:10:54 -04:00
mzimann
2044487158 Added a comment: push doc-only changes 2020-06-18 15:54:52 +00:00
Joey Hess
0f43efa15b
tail the find in dist-newstyle
unfortunately old builds for old versions can linger in there
2020-06-18 11:37:43 -04:00
Joey Hess
572369ced2
clean dist-newstyle 2020-06-17 17:44:38 -04:00
Joey Hess
d46490c17f
add news item for git-annex 8.20200617 2020-06-17 16:00:23 -04:00
Joey Hess
48a88d822d
releasing package git-annex version 8.20200617 2020-06-17 15:59:34 -04:00
Joey Hess
3464fa12c7
meh 2020-06-17 15:58:39 -04:00
Joey Hess
762fd5ae5d
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-17 15:35:27 -04:00
strmd
8c8e61ca1d Added a comment 2020-06-17 19:34:13 +00:00