diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-27 12:41:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-27 12:41:53 -0400 |
| commit | 3d84ec1bda71771c5d04c4c8ade37977eecf5a65 (patch) | |
| tree | 5942be10cbe989b366e2f81034bbf26c58da9512 /doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn | |
| parent | 3aaf1fcc549791c19688a8d91cacc7c037506de5 (diff) | |
response
Diffstat (limited to 'doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn')
| -rw-r--r-- | doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn | 6 |
1 files changed, 6 insertions, 0 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 d4e2635f5..5c654ff2b 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 @@ -3,3 +3,9 @@ After a series of pretty convoluted copying files around between annex'd repos a 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. + +> What do you mean when you say that git "got wedged"? It hung somehow? +> +> If git-annex runs concurrently with another git command that locks +> the repository its git add of log files can fail. +> --[[Joey]] |