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

Support git remotes where .git is a file, not a directory

Browse source 
Eg when --separate-git-dir was used, and core.symlinks=false.

This commit was sponsored by Brock Spratlen on Patreon.
This commit is contained in:
Joey Hess 2020-08-28 15:08:14 -04:00
parent cde3e5eb0c
commit 41ebed3941
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 60 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/separate-git-dir_OK_under_Linux_FAIL_under_Windows.mdwn
View file

@ -178,3 +178,5 @@ shaddy@jazz-debian:~/slaveproj$ ls -lL services
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
This issue is not a show stopper. I otherwise love the concepts behind git-annex very much.
> [[fixed|done]] --[[Joey]]

35
doc/bugs/separate-git-dir_OK_under_Linux_FAIL_under_Windows/comment_1_97ab8d245680e23a9e4b471796db2119._comment Normal file
View file

@ -0,0 +1,35 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2020-08-28T18:03:46Z"
content="""
--separate-git-dir makes eg, masterproj/.git be a file that contains the
path to the git dir.
git-annex init converts such a .git file to a symlink. That is necessary
for git-annex symlinks to be resolved, since they always link to files
inside .git, and if it's a file, the symlinks won't point to the object
files.
On windows, since core.symlinks is false, it does not make that change.
So, I think the problem might be that, when .git is a file rather
than a symlink, git-annex in the clone doesn't read the .git file to determine
the real git repo location, and so can't find annexed files in its remote.
Seem to have found a way to produce the same problem on linux:
* git init --separate-git-dir masterproj.git masterproj
* cd masterproj; git config core.symlinks false
* git-annex init
* add file, commit, make clone
git-annex get in the clone then fails
openat(AT_FDCWD, "../masterproj/.git/annex/objects/3f/3K/SHA256E-s30--32a7ec5a2905bbeda54a699ed797c96c1fea7b5bc31a6cc104b2ddefe65a95bb/SHA256E-s30--32a7ec5a2905bbeda54a699ed797c96c1fea7b5bc31a6cc104b2ddefe65a95bb", O_RDONLY) = -1 ENOTDIR (Not a directory)
So, I think it would make sense for git-annex to notice when
a remote's .git is a file rather than a directory, and adjust the remote
accordingly, so it uses its actual git directory. That will solve
this situation.
"""]]