search

ucphhpc / migrid-sync

MiGrid workspace where master branch is kept strictly in sync with SF upstream svn repo. Any development or experiments should use a branch. You probably want to fork your own clone or work e.g. on the edge branch if you wish to contribute.
GNU General Public License v2.0
3 stars 4 forks source link

removed double file from EpistasisOnGrid #18

Closed benibr closed 9 months ago

benibr commented 12 months ago

This files exists both in git:

Apparently git cannot handle this situation, so it always shows one files as changed while the other one is actually accessible in the directory

Here we can see that git always shows a changed file, that is not actually listed in the filesystem:

~/W/k/migrid-sync (master)> git reset --hard origin/master
HEAD is now at 30b79176 remove quoting of OIDCPassClaimsAs value as it needs to support the optional 2nd encoding argument

~/W/k/migrid-sync (master)> git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   user-projects/EpistasisOnGrid/GUI/EpistasisGUI.wxg

no changes added to commit (use "git add" and/or "git commit -a")

zsn342@FAD1027541 ~/W/k/migrid-sync (master)> ls  user-projects/EpistasisOnGrid/GUI/
epistasisgui.wxg    epistasisviewer.py*

This PR removes the doubled file, to make git happy again.

jonasbardino commented 9 months ago

AFAIK git can actually handle such cases just fine, but it appears to blow up on Mac OSX because of the dumbed-down case-insensitive world view presented to it on that platform :-)

Rather than accepting the PR I've migrated the entire user-projects folder into a new migrid-user-projects repo, as it is legacy code and probably of little interest to most migrid deployments.