Commit graph

32760 commits

Author SHA1 Message Date
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
Joey Hess
a352368f8e
followup 2018-09-11 13:27:51 -04:00
Joey Hess
f23118f214
response 2018-09-11 13:14:37 -04:00
Joey Hess
e01903efc5
response 2018-09-11 13:13:27 -04:00
yarikoptic
9632da100c initial report on problem accessing previously exported public bucket 2018-09-11 17:07:16 +00:00
Joey Hess
288d26eb9e
response 2018-09-11 13:00:59 -04:00
Joey Hess
e0b1e0ef7b
comment and clarification 2018-09-11 12:55:31 -04:00
yarikoptic
da1f580e4b Added a comment 2018-09-11 16:53:39 +00:00
Joey Hess
172221ce4f
response 2018-09-11 12:49:41 -04:00
Joey Hess
5e010fc85d
comment 2018-09-11 12:35:20 -04:00
Joey Hess
b89de070f0
response 2018-09-11 12:32:09 -04:00
kyle
69448f2a40 fixed 2018-09-10 18:30:46 +00:00
kyle
25fecfd50f Added a comment: fixed 2018-09-10 18:27:49 +00:00
yarikoptic
278be9c638 Added a comment: what to be done for previously exported instances? 2018-09-10 17:03:17 +00:00
https://me.yahoo.com/a/iOGTltEpmOTQ.xZ99NFP5c7Zdcc-#6a7ba
eb8e1bb56c Added a comment: adding metadata to keys that don't point to any contents is ok, correct? 2018-09-08 22:36:06 +00:00
ewen
224e71e7d0 Added a comment: x86-64 build working on Synology NAS (with work around) 2018-09-08 02:03:21 +00:00
https://me.yahoo.com/a/iOGTltEpmOTQ.xZ99NFP5c7Zdcc-#6a7ba
e0427b5679 Added a comment 2018-09-07 21:08:24 +00:00
kyle
4dc5c7a94a Added a comment: re: drop everything but subdirectory 2018-09-07 20:13:03 +00:00
https://me.yahoo.com/a/iOGTltEpmOTQ.xZ99NFP5c7Zdcc-#6a7ba
d4eebde67d Added a comment 2018-09-07 18:10:06 +00:00
https://me.yahoo.com/a/iOGTltEpmOTQ.xZ99NFP5c7Zdcc-#6a7ba
cf2cc6f7fc Added a comment 2018-09-07 18:04:51 +00:00
https://me.yahoo.com/a/iOGTltEpmOTQ.xZ99NFP5c7Zdcc-#6a7ba
1f0ab538fc 2018-09-07 17:01:04 +00:00
https://me.yahoo.com/a/iOGTltEpmOTQ.xZ99NFP5c7Zdcc-#6a7ba
cbe82e14fc Added a comment 2018-09-07 15:59:06 +00:00
https://me.yahoo.com/a/iOGTltEpmOTQ.xZ99NFP5c7Zdcc-#6a7ba
492b36a456 Added a comment: keys from metadata 2018-09-07 15:57:37 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
50e3cac811 Added a comment 2018-09-07 12:27:28 +00:00
inecas@fe552cc962c331a5cb1499e80bd5b2aa0808d987
844595a897 Added a comment 2018-09-07 07:25:54 +00:00
yarikoptic
c16856b8eb Added a comment: the reason is system wide git version! 2018-09-07 00:13:33 +00:00
yarikoptic
80f61cfaaa initial report on problem with v6 in subdirectory 2018-09-06 23:43:12 +00:00