fix: correct order of lfs pull and repo config for git proxy #486
Conversation
This needed a bit of cleanup and refactoring of the autosave branch handling in the init container.
There was a problem hiding this comment.
I tested this with a private project that has LFS files and things work. With autofetch on I have the files there right away without running the extra command to download files.
I just have one question about the code.
The thing about conflicting autosave branches with 7 character commit shas that match is not a problem IMO. Isn't the probability very low of getting the first 7 characters of the commit sha that are the same for two or even more branches?
The naming of the autosave branches is determined here. So the commit SHA we're looking at the commented location is from the commit previous to the autosave commit. So basically the code here silently assumes that for one user/branch/commit-sha combo, there can be no more than one autosave branch. We kind of enforce this by always dropping the user into an existing autosave environment (and deleting the autosave branch while doing this) and by allowing only one running session per user/branch/commit, so one would have to almost know how to trick the system to end up with two autosave branches for the same base commit. Therefore I agree, my comment is probably not super relevant and should definitely not be phrased as a TODO. I'll change that. |
If you haven't done so already, I'd be very grateful if you could also test the autosave recovery. As far as I can tell it still works in the same way, but someone else touching it would be great. |
|
@ableuler I can confirm that uncommitted work is successfully recovered. |
|
@olevski I improved the language of the comments a bit - can you please re-approve? Thx! |
ableuler
force-pushed
the
000-fix-lfs-auto-fetch
branch
from
6ebc786
to
85974f7
Compare
This also needed a bit of cleanup and refactoring of the autosave branch handling in the init container.