Joey Hess
a02b5c2904
response
2021-06-14 12:36:42 -04:00
yarikoptic
51fede57a2
Added a comment
2021-06-14 16:23:41 +00:00
Ilya_Shlyakhter
35afd58a76
Added a comment: git-annex-add slowdown
2021-06-14 16:00:44 +00:00
Joey Hess
c4f1465a81
check symlink before reading file
...
This is faster because when multiple files are in a directory, it gets
cached.
2021-06-14 11:53:51 -04:00
Joey Hess
4163344ed6
retitle
2021-06-14 11:44:55 -04:00
Joey Hess
0eff5a3f71
reproduced
2021-06-14 11:37:21 -04:00
yarikoptic
8f66f73fea
Added a comment
2021-06-09 22:28:06 +00:00
yarikoptic
e30f973323
Added a comment: more "mystery resolved" -- identical (empty) keys
2021-06-09 21:00:34 +00:00
Joey Hess
4b09b93a18
Merge branch 'master' of ssh://git-annex.branchable.com
2021-06-09 15:38:58 -04:00
Joey Hess
fad281767a
comment
2021-06-09 15:38:55 -04:00
yarikoptic
714d9f1315
Added a comment
2021-06-08 22:02:34 +00:00
yarikoptic
a8fb61329d
Added a comment
2021-06-08 21:58:20 +00:00
yarikoptic
3985ae3224
Added a comment: OSX mystery resolved. add --batch is effective mitigation
2021-06-08 21:56:53 +00:00
Joey Hess
6cb9113ff5
comments
2021-06-08 17:38:56 -04:00
yarikoptic
c3993a2655
Added a comment
2021-06-08 20:23:09 +00:00
yarikoptic
437d9366b7
Added a comment: getting closer...
2021-06-08 19:21:59 +00:00
Ilya_Shlyakhter
be4a029e1b
Added a comment
2021-06-08 19:08:01 +00:00
yarikoptic
697921ecd8
Added a comment: all recent builds/logs are fetched to smaug
2021-06-08 16:50:12 +00:00
Joey Hess
ecbaa52571
clarification
2021-06-08 12:00:01 -04:00
Joey Hess
1a6fa5abc8
add debugging for reconcileStaged calls for benchmarking
2021-06-08 11:57:23 -04:00
yarikoptic
62758ffb9f
Added a comment: slow down is OSX specific
2021-06-08 14:28:18 +00:00
Joey Hess
d12120739d
comment
2021-06-08 10:19:04 -04:00
yarikoptic
57b567ac87
Added a comment
2021-06-07 21:39:05 +00:00
yarikoptic
2ffb9cc01b
Added a comment: clarification
2021-06-07 21:20:35 +00:00
Joey Hess
e9a8b48a52
Merge branch 'master' of ssh://git-annex.branchable.com
2021-06-07 17:02:15 -04:00
Joey Hess
0f10f208a7
avoid double work in git-annex init
...
reconcileStaged was doing a redundant scan to scannAnnexedFiles.
It would probably make sense to move the body of scannAnnexedFiles
into reconcileStaged, the separation does not really serve any purpose.
Sponsored-by: Dartmouth College's Datalad project
2021-06-07 16:50:14 -04:00
Ilya_Shlyakhter
bdf3c06401
Added a comment: deferring the scan
2021-06-07 17:41:45 +00:00
Joey Hess
0101363eb8
correctly update keys db in merge conflict
...
This is quite a subtle edge case, see the bug report for full details.
The second git diff is needed only when there's a merge conflict.
It would be possible to speed it up marginally by using
--diff-filter=Unmerged, but probably not enough to bother with.
Sponsored-by: Graham Spencer on Patreon
2021-06-07 12:52:36 -04:00
Joey Hess
da24034331
comment
2021-06-07 11:53:25 -04:00
Joey Hess
3aabaa1a2b
Merge branch 'master' of ssh://git-annex.branchable.com
2021-06-07 11:47:13 -04:00
Joey Hess
254199edc9
comment
2021-06-07 11:46:47 -04:00
jwodder
8822bf0803
2021-06-07 14:32:25 +00:00
Atemu
234d235a03
rename bugs/delayadd_doesn__39__t_work.mdwn to bugs/delayadd_doesn__39__t_work_with_smallfiles.mdwn
2021-06-06 16:50:40 +00:00
falsifian
f58d686ccf
Add bug report
2021-06-05 20:31:39 +00:00
yarikoptic
717000f4f8
Added a comment
2021-06-05 13:50:43 +00:00
yarikoptic
c5e62c1968
Initial report on performance regression
2021-06-05 13:23:13 +00:00
Joey Hess
5b7429e73a
avoid removing old associated file when there is a merge conflict
...
It makes sense to keep the key used by the old version of an
associated file, until the merge conflict is resolved.
Note that, since in this case git diff is being run with --index, it's
not possible to use -1 or -3, which would let the keys
associated with the new versions of the file also be added. That would
be better, because it's possible that the local modification to the file
that caused the merge conflict has not yet gotten its new key recorded
in the db.
Opened a bug about a case this is thus not able to address.
Sponsored-by: Boyd Stephen Smith Jr. on Patreon
2021-06-01 11:43:00 -04:00
Joey Hess
f00e365f41
comments
2021-05-31 17:54:17 -04:00
Atemu
1b6715b4ca
Added a comment
2021-05-31 19:07:31 +00:00
Ilya_Shlyakhter
9dbf93b9c5
Added a comment: clarifying preferred content expressions
2021-05-30 19:40:51 +00:00
Joey Hess
cd73fcc92c
Merge branch 'master' of ssh://git-annex.branchable.com
2021-05-25 11:45:02 -04:00
Joey Hess
483fc4dc6b
Merge branch 'trackassociated'
2021-05-25 11:43:52 -04:00
Joey Hess
01331f0b8f
required content update
2021-05-25 10:04:29 -04:00
Joey Hess
45c0fb29f0
update
2021-05-25 09:58:46 -04:00
Atemu
82ee0f053b
Added a comment
2021-05-25 11:00:39 +00:00
Joey Hess
9a5981a153
comment
2021-05-24 16:43:06 -04:00
Joey Hess
125a28c58e
Merge branch 'master' of ssh://git-annex.branchable.com
2021-05-24 16:31:58 -04:00
Joey Hess
07c98a4ce2
update
2021-05-24 16:31:14 -04:00
Joey Hess
63de81b52a
Merge branch 'master' into trackassociated
2021-05-24 16:27:24 -04:00
Joey Hess
2de49c186f
update
2021-05-24 16:27:07 -04:00
