fix a case where file tracked by git unexpectedly becomes annex pointer file
authorJoey Hess <joeyh@joeyh.name>
Fri, 27 Dec 2019 18:58:10 +0000 (14:58 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 27 Dec 2019 19:08:03 +0000 (15:08 -0400)
commitea3cb7d27773046eb65a54fb3932bfe847427420
treede1cb3d2f26548402bf26265270835b804352772
parentb9481c6ba09fb21dd596a616c95f1eb1af2b7598
fix a case where file tracked by git unexpectedly becomes annex pointer file

smudge: When annex.largefiles=anything, files that were already stored in
git, and have not been modified could sometimes be converted to being
stored in the annex. Changes in 7.20191024 made this more of a problem.
This case is now detected and prevented.
Annex/CatFile.hs
Annex/HashObject.hs
CHANGELOG
Command/Smudge.hs
Git/CatFile.hs
Git/HashObject.hs
Git/UnionMerge.hs
doc/bugs/A_case_where_file_tracked_by_git_unexpectedly_becomes_annex_pointer_file.mdwn
doc/bugs/A_case_where_file_tracked_by_git_unexpectedly_becomes_annex_pointer_file/comment_4_4c3b233aa1c6b0b6c0b0d7519b5877a1._comment
doc/todo/git_annex_add_option_to_control_to_where.mdwn [new file with mode: 0644]