Commit graph

32586 commits

Author SHA1 Message Date
AndyPerry
a64fa553b1 Added a comment 2018-09-14 11:39:41 +00:00
pz63@5ea0a27986d782e467e1ebef6eb31ba440cc58d5
3bfc7eee11 2018-09-14 11:38:34 +00:00
AndyPerry
8863d1d910 Added a comment 2018-09-14 09:49:57 +00:00
yarikoptic
410b4bf318 we grew up to over 50TB 2018-09-14 02:53:11 +00:00
Joey Hess
a31f225b34
add news item for git-annex 6.20180913 2018-09-13 15:51:37 -04:00
Joey Hess
547d01fd0e
releasing package git-annex version 6.20180913 2018-09-13 15:50:50 -04:00
Joey Hess
c53fe82886
devblog 2018-09-13 15:50:16 -04:00
yonkers
7061aabd90 Added a comment: I think I found the answer, will try laer 2018-09-13 18:18:30 +00:00
Joey Hess
fc5082ff38
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-13 14:00:24 -04:00
Joey Hess
a7f0b99a33
fix v6 deadlock with git 2.1.4
I don't know why git diff --raw would run the clean filter, but it did
with this version of git. Perhaps it is cleaning the file to generate the
diff to search with -G?  But then why would newer gits not run the clean
filter?

It caused git annex to deadlock because the keys database was locked
and ran a git command that ran git-annex, which tried to read from the
keys database.

This commit was sponsored by Brett Eisenberg on Patreon.
2018-09-13 13:55:25 -04:00
yonkers
5fec95adbb git annex list whereis slow when 1 repo offline (dir from esata) 2018-09-13 17:50:08 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
a1327779a9 Added a comment 2018-09-13 14:56:51 +00:00
Joey Hess
b18fb1e343
clean P2P protocol shutdown on EOF
Avoids "git-annex-shell: <stdin>: hGetChar: end of file"
being displayed by the test suite, due to the way it
runs git-annex-shell without using ssh.

git-annex-shell over ssh was not affected because git-annex hangs up the
ssh connection and so never sees the error message that git-annnex-shell
probably did emit.

This commit was sponsored by Ryan Newton on Patreon.
2018-09-13 10:46:37 -04:00
Joey Hess
e4d1914e3a
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-13 10:01:20 -04:00
Joey Hess
677038199c
fix build with older aws
S3: Multipart uploads are now only supported when git-annex is built
with aws-0.16.0 or later, as earlier versions of the library don't
support versioning with multipart uploads.

This will affect the android build, and debian stable also has a too old
aws to support both features at the same time.

This commit was sponsored by Nick Piper on Patreon.
2018-09-13 09:58:39 -04:00
git-annex.branchable.com@79d6855760f61f7fbe0a401b45d8c791ef49b500
81e76d815c 2018-09-13 04:24:03 +00:00
Joey Hess
8daccbc2b3
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-12 15:43:43 -04:00
Joey Hess
ac021e8734
followup 2018-09-12 15:43:20 -04:00
Ilya_Shlyakhter
df3af94459 Added a comment 2018-09-12 19:33:04 +00:00
Joey Hess
f1f3d15404
response 2018-09-12 15:31:03 -04:00
Joey Hess
6812e3e768
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-12 15:24:14 -04:00
Joey Hess
50217f62a1
avoid duplicate add action for v6 unlocked modified file
The new second pass sees the file as type changed because the first
pass's changes have typically not reached git yet. So, have to
explicitly check for unmodified files in the second pass.

Note that, if the file has been touched but not really modified,
the first pass will handle it, and so the second pass does nothing.

This commit was sponsored by Jochen Bartl on Patreon.
2018-09-12 15:20:34 -04:00
Ilya_Shlyakhter
91bdfd03e6 Added a comment 2018-09-12 19:10:46 +00:00
torpidus
bf226068c8 Added a comment 2018-09-12 19:05:40 +00:00
Joey Hess
8b21761a42
devblog 2018-09-12 14:29:03 -04:00
Joey Hess
cd3f231d21
retitle 2018-09-12 14:21:39 -04:00
Joey Hess
a0dc0afdcb
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-12 14:20:10 -04:00
Joey Hess
0bbc47d567
response 2018-09-12 14:19:48 -04:00
Joey Hess
c63d28b39b
fix build with older ghc
null only used to work on lists, not sets.

Fixes the Android build and probably also i386ancient.

This commit was sponsored by mo on Patreon.
2018-09-12 14:10:08 -04:00
torpidus
cc01504275 2018-09-12 18:09:53 +00:00
Joey Hess
2743224658
change v6 git-annex add of staged unmodified unlocked file
v6: When a file is unlocked but has not been modified, and the unlocking is
only staged, git-annex add did not lock it. Now it will, for consistency
with how modified files are handled and with v5.

Note the removal of the sameInodeCache check. Otherwise it would see
that the unmodified file is unmodified and stop there. That check seems to have
been copied from the direct mode branch. But, direct mode had a specific
reason to check for unmodified content, that does not apply to v6.

The second pass means there is potential for a race, eg the unlocked
file could be modified in between the first and second passes.
No problem with that, since both passes do the same thing.

This commit was sponsored by Jake Vosloo on Patreon.
2018-09-12 14:00:05 -04:00
Ilya_Shlyakhter
7bee3d9e1e Added a comment: when push fails due to non-fast-forward merge, pull and retry? 2018-09-12 17:56:41 +00:00
Joey Hess
5e0c7bf81d
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-12 11:53:46 -04:00
yarikoptic
a099fd4184 initial report on whereis kaboom 2018-09-12 14:02:48 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
20543bc340 Added a comment 2018-09-12 10:45:04 +00:00
ewen
00d4a58ff7 Added a comment: LC_TIME 2018-09-11 23:52:23 +00:00
ewen
3b8cbe55b2 Added a comment: LC_TIME 2018-09-11 22:23:49 +00:00
ewen
7bf914a22e Added a comment: timer_create 2018-09-11 21:37:25 +00:00
Joey Hess
942b466293
wording 2018-09-11 16:03:58 -04:00
Joey Hess
6d73fddce6
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-11 16:00:04 -04:00
Joey Hess
ddcb8b3d4f
followup 2018-09-11 15:59:40 -04:00
Joey Hess
fdbdf64d87
fix reversions due to undocumented and buggy git behavior
* Don't use GIT_PREFIX when GIT_WORK_TREE=. because it seems git
  does not intend GIT_WORK_TREE to be relative to GIT_PREFIX in that
  case, despite GIT_WORK_TREE=.. being relative to GIT_PREFIX.
* Don't use GIT_PREFIX to fix up a relative GIT_DIR, because
  git 2.11 sets GIT_PREFIX set to a path it's not relative to.
  and apparently GIT_DIR is never relative to GIT_PREFIX.

Commit e50ed4ba48 led us down this path
by working around a git bug by relying on the barely documented GIT_PREFIX.

This commit was sponsored by Trenton Cronholm on Patreon.
2018-09-11 15:54:21 -04:00
bnyn
d1b7cbb95e Added a comment: Update 2018-09-11 19:29:39 +00:00
Joey Hess
30b1e7cb34
followup 2018-09-11 14:42:37 -04:00
Joey Hess
48205ff829
followup 2018-09-11 14:31:49 -04:00
Joey Hess
88e5292417
followup 2018-09-11 14:06:46 -04:00
Joey Hess
c54a8bff15
correlate to bug report 2018-09-11 13:46:44 -04:00
Joey Hess
ef53ad8b5b
response 2018-09-11 13:37:28 -04:00
Joey Hess
1e71dbf812
Merge branch 'master' of ssh://git-annex.branchable.com 2018-09-11 13:30:01 -04:00
Joey Hess
0f87c92cc6
close this old poll
I suspect votes by spambots..
2018-09-11 13:29:19 -04:00