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

unannex: Commit staged changes at end

Browse source 
to avoid some confusing behavior with the pre-commit hook, which would see
some types of commits after an unannex as checking in of an unlocked file.
This commit is contained in:
Joey Hess 2011-02-01 21:26:19 -04:00
parent 9aecf4110a
commit c77ac11acc
5 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/forum/unannex_alternatives/comment_3_b1687fc8f9e7744327bbeb6f0635d1cd._comment
View file

@ -8,5 +8,9 @@ Sorry for all the followups, but I see now that if you unannex, then add the fil
This seems to be a bug. git-annex's hook thinks that you have used git annex unlock (or \"git annex edit\") on the file and are now committing a changed version, and the right thing to do there is to add the new content to the annex and update the symlink accordingly. I'll track this bug over at [[bugs/unannex_vs_unlock_hook_confusion]].
So, committing after unannex, and before checking the file into git in the usual way, is a workaround.
So, committing after unannex, and before checking the file into git in the
usual way, is a workaround. But only if you do a "git commit" to commit
staged changes.
Anyway, this confusing point is fixed in git now!
"""]]