diff options
author | https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus <Jimmy@web> | 2011-03-27 10:33:08 +0000 |
---|---|---|
committer | admin <admin@branchable.com> | 2011-03-27 10:33:08 +0000 |
commit | 07d15ab2eae88059f2a90e1b389e5ce34deeafe6 (patch) | |
tree | 25e4a3329402f18badd2c9587c3834bcf67be980 | |
parent | 2f32b7afc0ba361a4b92b74357115284634af529 (diff) |
-rw-r--r-- | doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn index 89b6f9bee..d4e2635f5 100644 --- a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn +++ b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn @@ -1,5 +1,5 @@ After a series of pretty convoluted copying files around between annex'd repos and pulling changes around between repos. I noticed that occassionally when git-annex tries to stage files (the `.git-annex/*/*/*logs`) git some times gets wedged and doing a "git commit -a" doesn't seem to work or files might not get added thus leaving a bunch of untracked files or modified files that aren't staged for a commit. -I tried running a *git add -u .git-annex/* and also just the usual *git add* then a commit fixes things for me. If I don't do that then my subsequent merges/pulls will fail and result in *no known copies of files* I suspect git-annex might have just touched some file modes and git picked up the changes but got confused since there was no content change. It might also just be a git on OSX thing and it doesn't affect linux/bsd users. +I tried running a *`git rm --cached -f -r *`* then *git add -u .git-annex/* or the usual *git add* then a commit fixes things for me. If I don't do that then my subsequent merges/pulls will fail and result in *no known copies of files* I suspect git-annex might have just touched some file modes and git picked up the changes but got confused since there was no content change. It might also just be a git on OSX thing and it doesn't affect linux/bsd users. For now it's just a bit of extra work for me when it does occur but it does not seem to occur often. |