diff options
author | https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus <Jimmy@web> | 2011-03-27 10:21:18 +0000 |
---|---|---|
committer | admin <admin@branchable.com> | 2011-03-27 10:21:18 +0000 |
commit | 2f32b7afc0ba361a4b92b74357115284634af529 (patch) | |
tree | c6c2d3053ad7364de3834411bc8c33258bbeb558 | |
parent | 433c1780cff5673591be94deae02e775f804ab7c (diff) |
-rw-r--r-- | doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn | 5 |
1 files changed, 5 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 new file mode 100644 index 000000000..89b6f9bee --- /dev/null +++ b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn @@ -0,0 +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. + +For now it's just a bit of extra work for me when it does occur but it does not seem to occur often. |