Merge branch 'master' into sqlite

doc/todo/only_pass_unlocked_files_through_the_clean__47__smudge_filter.mdwn

@@ -1 +1,3 @@
 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.
+
+> not a viable solution, [[done]] --[[Joey]]

doc/todo/only_pass_unlocked_files_through_the_clean__47__smudge_filter/comment_1_c614ab0aeab4a8d27d3a1da3db3c7e05._comment

@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2019-11-22T16:01:26Z"
+ content="""
+It immediately occurs to me that the proposal would break this:
+
+	git annex add foo
+	git annex add bar
+	git annex unlock bar
+	git mv bar foo
+	git commit -m add
+
+Since foo was a locked file, gitattributes would prevent from being
+smudged, so the large content that was in bar gets committed directly to git.
+
+The right solution is to improve the smudge/clean filter interface to it's
+not so slow, which there is copious discussion of elsewhere.
+"""]]

doc/todo/split_off_clean__47__smudge_filter__63__.mdwn

@@ -1 +1,5 @@
 If running the clean/smudge filter once per file is a [[bottleneck|forum/Adding_files_to_git__58___Very_long___34__recording_state_in_git__34___phase]], might it speed things up to split them off into something more lightweight than the full git-annex binary?
+
+> This is a duplicate of stuff discussed at
+> [[todo/git_smudge_clean_interface_suboptiomal]], so closing. [[done]]
+> --[[Joey]]