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

response

Browse source
This commit is contained in:
Joey Hess 2011-03-27 12:41:53 -04:00
parent 3aaf1fcc54
commit 3d84ec1bda
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
doc/bugs/git-annex_directory_hashing_problems_on_osx.mdwn
View file

@ -12,4 +12,21 @@ $ git add -i
this has somewhat confused git when it tries to stage/merge files, I didn't notice this at first, but it is definately a problem for someone using case insensitive filesystems like the default OSX HFS+ formats or vfat/fat32.
> I feel a bit stupid to not have considered case-insensative filesystems.
> They are just so far from where I have lived for 20 years that it's hard
> to keep them in mind.
>
> I guess that
> [[git-annex_has_issues_with_git_when_staging__47__commiting_logs]] is
> somehow a consequence (or cause?) of this, but I don't quite understand
> how this is causing git to fail to stage files, or stage the same file
> twice under different capitalizations. git-annex always will run git add
> on the path with the "correct" capitalization. So unless something else
> has added the path with the other capitalization (perhaps git add
> .git-annex manually?) I don't understand how you get to this state.
> --[[Joey]]
Also I came across this when I accidentally annexed some files in the .git-annex directory and it cause git-annex/git to be very unhappy when i pulled the repo to somewhere else. It might be worth teaching git-annex to disallow annex'ing of files inside the .git-annex/.git directories.
> There is a guard against `git annex add .git-annex/foo`, but it doesn't
> notice `cd .git-annex; git annex add foo`. --[[Joey]]

6
doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn
View file

@ -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]]