From dc412c6d75348ca6d03b5582a400f1e7198ebec3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 May 2021 12:42:56 -0400 Subject: [PATCH] comment --- ..._3c3c4b9ee0a99f0638717922785de675._comment | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 doc/forum/one-off_unlocked_annex_files_that_go_against_large/comment_3_3c3c4b9ee0a99f0638717922785de675._comment diff --git a/doc/forum/one-off_unlocked_annex_files_that_go_against_large/comment_3_3c3c4b9ee0a99f0638717922785de675._comment b/doc/forum/one-off_unlocked_annex_files_that_go_against_large/comment_3_3c3c4b9ee0a99f0638717922785de675._comment new file mode 100644 index 0000000000..0bbb28fe77 --- /dev/null +++ b/doc/forum/one-off_unlocked_annex_files_that_go_against_large/comment_3_3c3c4b9ee0a99f0638717922785de675._comment @@ -0,0 +1,29 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2021-05-10T16:20:37Z" + content=""" +Well Lukey was right, fixing this causes other breakage. Here's +the bug report about what my change broke: +[[bugs/case_where_using_pathspec_with_git-commit_leaves_s]] + +As well as the case in that bug, [[tips/largefiles]] has a recipe to convert +an annexed file to be stored in git, which the change broke. +The recipe has `git annex add --force-small` be run on a file, which in turn +runs `git add` on the file, which runs the smudge filter. So if the smudge +filter then sees an annexed inode and keeps it annexed, it is going against +what the user is trying to do there. + +So the change has been reverted. + +I guess that both problems could be avoided by having git-annex add not run +git add, but stage the file in the index itself. (IIRC there were some +reasons to use git add there, to do with .gitignore.) + +But I'm doubtful now that all problems could be avoided. For one, +consider what happens when the user follows the recipe to convert an +annexed file to be stored in git, running `git annex add --force-small +file`, which does store it in git. But then, if the smudge clean filter runs +on the file later for any reason, it would still see a known annexed inode, +and convert it back to being stored in the annex. +"""]] -- 2.30.2