mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2019-09-24 14:46:43 -04:00
commit 789721b65f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/forum/Adding_files_to_git__58___Very_long___34__recording_state_in_git__34___phase/comment_3_71bbf490cfa2cbfab322aab865d93261._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8"
nickname="achilleas.k"
avatar="http://cdn.libravatar.org/avatar/ed6c67c4d8e6c6850930e16eaf85a771"
subject="comment 3"
date="2019-09-24T15:04:49Z"
content="""
Reading up more on the issue (the page you linked and some other pages regarding the way smudge/clean filters affect performance), I'm still not sure I understand the exact issue for this case. When adding a lot of files to the annex directly, there's no issue. Am I understanding the smudge/clean filter performance issues incorrectly? When the `largefiles` option is used and files are added to git (instead of annex), what does the smudge filter do to the file or its contents that requires extra time? I guess I'm not clear on what exactly happens when a file is excluded from a `largefiles` filter that takes longer than adding a file to git-annex. I would have expected the opposite to be true.
"""]]

22
doc/forum/Adding_files_to_git__58___Very_long___34__recording_state_in_git__34___phase/comment_4_66dbcc3600c1df2df03896935dfce9c0._comment Normal file
View file

@ -0,0 +1,22 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="non-annexed files still get passed through the clean/smudge filter"
date="2019-09-24T17:26:09Z"
content="""
\"what exactly happens when a file is excluded from a largefiles filter that takes longer\" -- looking in `.git/info/attributes`:
[[!format sh \"\"\"
* filter=annex
.* !filter
\"\"\"]]
i.e. _all_ files except dotfiles get passed through the clean/smudge filter defined in `.git/config`:
[[!format sh \"\"\"
[filter \"annex\"]
smudge = git-annex smudge -- %f
clean = git-annex smudge --clean -- %f
\"\"\"]]
It would be better if `git-annex` would only add unlocked files to .gitattributes (the one at the repo root), and remove them when they're locked. This would also make it easier to find the unlocked files.
"""]]

11
doc/forum/Adding_files_to_git__58___Very_long___34__recording_state_in_git__34___phase/comment_5_665bdcd79b486f8d2604eb6de5c10b2b._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8"
nickname="achilleas.k"
avatar="http://cdn.libravatar.org/avatar/ed6c67c4d8e6c6850930e16eaf85a771"
subject="comment 5"
date="2019-09-24T17:29:28Z"
content="""
> i.e. all files except dotfiles get passed through the clean/smudge filter defined in .git/config:
Right, that's understandable. Why is it faster to clean/smudge a file going into annex than it is going into git though?
"""]]

8
doc/git-annex-metadata/comment_9_a14b21109aa12eaf13e8c215e108cc29._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="tobiasBora"
avatar="http://cdn.libravatar.org/avatar/80a7d8c2a7b475b6b71198cce0faa6b0"
subject="comment 9"
date="2019-09-24T14:49:21Z"
content="""
Ok thank you! If you also have names of music playes that can actually read tags from git annex, let me know!
"""]]

25
doc/projects/neurohub.mdwn Normal file
View file

@ -0,0 +1,25 @@
NeuroHub [???](???)
==========================================================
???
## TODOs
[[!inline pages="todo/* and !todo/done and !link(todo/done) and tagged(projects/neurohub)" sort=mtime feeds=no actions=yes archive=yes show=0]]
### Done:
[[!inline pages="todo/* and !todo/done and link(todo/done) and tagged(projects/neurohub)" sort=mtime feeds=no actions=yes archive=yes show=0]]
## BUGs
[[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and tagged(projects/heurohub)" sort=mtime feeds=no actions=yes archive=yes show=0]]
### Done:
[[!inline pages="bugs/* and !bugs/done and link(bugs/done) and tagged(projects/neurohub)" sort=mtime feeds=no actions=yes archive=yes show=0]]

8
doc/todo/git_smudge_clean_interface_suboptiomal/comment_4_ef42e80aac54e02000c1a61b1f42aed0._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="kyle"
avatar="http://cdn.libravatar.org/avatar/7d6e85cde1422ad60607c87fa87c63f3"
subject="git docs on "%f""
date="2019-09-24T18:10:16Z"
content="""
Ilya, the patch that added the text you quote (52db4b0467, clarify %f documentation, 2016-07-11) was written by Joey, so I think it's safe to say that git-annex filters don't rely on \"%f\" being an actual file on disk.
"""]]

1
doc/todo/only_pass_unlocked_files_through_the_clean__47__smudge_filter.mdwn Normal file
View file

@ -0,0 +1 @@
Right now, non-annexed files get passed through the `annex` clean/smudge filter (see [[forum/Adding_files_to_git__58___Very_long___34__recording_state_in_git__34___phase]]). It would be better if `git-annex` configure the filter only for the annexed unlocked files, in the `.gitattributes` file at the root of the repository.