fix handling of deleted-but-not-staged files with git 2.40

jupyterhub / nbgitpuller

Jupyter server extension to sync a git repository one-way to a local path

https://nbgitpuller.readthedocs.io

BSD 3-Clause "New" or "Revised" License

205 stars 84 forks source link

fix handling of deleted-but-not-staged files with git 2.40 #302

Closed minrk closed 1 year ago

minrk commented 1 year ago

git 2.40 has apparently changed the handling of git merge -Xours when the file is:

removed locally, but not checked in
also removed remotely

to now conflict. It's unclear if this is a bug (I'm guessing it is). Running git checkout HEAD -- DELETED_FILE on the file prior to the pull does resolve the conflict, though.

yuvipanda commented 1 year ago

yay thanks, @minrk! Do you think we can matrix the tests here on git version?

minrk commented 1 year ago

added a git matrix via micromamba, leaving some to use the default from GHA (will tend to be very up-to-date, it seems) I picked the versions from currently supported Ubuntu LTS. I'm not sure how far back we want to go. I did have to make a tiny change to support git < 2.28 (in ubuntu 18.04), but only in the test utilities, not the actual package.

consideRatio commented 1 year ago

Nice!!!

yuvipanda commented 1 year ago

yay thanks @minrk and @consideRatio!

Should we attempt to make a release now?