diff options
| author |  http://joey.kitenet.net/ <joey@web> | 2011-02-02 00:46:00 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2011-02-02 00:46:00 +0000 |
| commit | 513da0f1ef4a1e05f4b4f9461b2eb1fad31fcb43 (patch) | |
| tree | f956d4caa7700227628ae94f4eb184a9ef5fe65e | |
| parent | b9f40099866201a23b998fcc9f15fce859907228 (diff) | |
Added a comment
| -rw-r--r-- | doc/forum/unannex_alternatives/comment_3_b1687fc8f9e7744327bbeb6f0635d1cd._comment | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/forum/unannex_alternatives/comment_3_b1687fc8f9e7744327bbeb6f0635d1cd._comment b/doc/forum/unannex_alternatives/comment_3_b1687fc8f9e7744327bbeb6f0635d1cd._comment new file mode 100644 index 000000000..548f7aacb --- /dev/null +++ b/doc/forum/unannex_alternatives/comment_3_b1687fc8f9e7744327bbeb6f0635d1cd._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 3" + date="2011-02-02T00:46:00Z" + content=""" +Sorry for all the followups, but I see now that if you unannex, then add the file to git normally, and commit, the hook *does* misbehave. + +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. +"""]] |