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

cherry-pick too

Browse source
This commit is contained in:
Joey Hess 2018-10-22 16:24:14 -04:00
parent ede54b93ea
commit 6bd67d4d46
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/todo/git_smudge_clean_interface_suboptiomal.mdwn
View file

@ -97,8 +97,8 @@ And here's the consequences of git-annex's workarounds:
fix the git status display. fix the git status display.
* git does not run any hook after a `git stash` or `git reset --hard`, * git does not run any hook after a `git stash` or `git reset --hard`,
so after these operations, annexed files remain unpopulated until or `git cherry-pick`, so after these operations, annexed files remain unpopulated
the user runs `git annex fix`. until the user runs `git annex fix`.
The best fix would be to improve git's smudge/clean interface: The best fix would be to improve git's smudge/clean interface:

3
doc/todo/smudge.mdwn
View file

@ -33,7 +33,8 @@ git-annex should use smudge/clean filters. v6 mode
once the merge got committed. once the merge got committed.
Problem: No hook seems to be run for git stash / git stash apply 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? git-annex command to populate the files after those commands?
Optionally: Use the filterdriver interface during checkout. Unfortunately that Optionally: Use the filterdriver interface during checkout. Unfortunately that