diff --git a/doc/todo/git_smudge_clean_interface_suboptiomal.mdwn b/doc/todo/git_smudge_clean_interface_suboptiomal.mdwn index 052d837e50..d3fcc3e301 100644 --- a/doc/todo/git_smudge_clean_interface_suboptiomal.mdwn +++ b/doc/todo/git_smudge_clean_interface_suboptiomal.mdwn @@ -97,8 +97,8 @@ And here's the consequences of git-annex's workarounds: fix the git status display. * git does not run any hook after a `git stash` or `git reset --hard`, - so after these operations, annexed files remain unpopulated until - the user runs `git annex fix`. + or `git cherry-pick`, so after these operations, annexed files remain unpopulated + until the user runs `git annex fix`. The best fix would be to improve git's smudge/clean interface: diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 9f699b6ae5..90fa46762d 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -33,7 +33,8 @@ git-annex should use smudge/clean filters. v6 mode once the merge got committed. Problem: No hook seems to be run for git stash / git stash apply - or for git reset --hard. Fatal or can we live with needing to run a + or for git reset --hard or git cherry-pick. + Fatal or can we live with needing to run a git-annex command to populate the files after those commands? Optionally: Use the filterdriver interface during checkout. Unfortunately that