polymorphicshade / Tubular

A fork of NewPipe that implements SponsorBlock and ReturnYouTubeDislike.
GNU General Public License v3.0
1.11k stars 24 forks source link

broken file mode for app/src/main/res/layout-land/list_stream_card_item.xml #60

Closed obfusk closed 2 months ago

obfusk commented 2 months ago

Something seems to have gone wrong in 305c17c2018cdcfa2f98506795406177aac791cf. You can see the file has the wrong mode bits, still being considered a symlink by git but containing XML instead of a file path, which breaks checkout on Linux (unless you use the core.symlinks false workaround like you do in CI and I did here):

$ git ls-files -s app/src/main/res/layout-land/*
100644 ec00c01ad0de387be75612f09a584716362a99ae 0       app/src/main/res/layout-land/activity_player_queue_control.xml
120000 793942568e4762391ceaac588c1b47f6431d00e6 0       app/src/main/res/layout-land/list_stream_card_item.xml

If I delete the file with git rm -f, then copy it back (instead of overwriting it) the mode gets fixed, which should unbreak this:

$ git rm -f app/src/main/res/layout-land/list_stream_card_item.xml
rm 'app/src/main/res/layout-land/list_stream_card_item.xml'
$ cp -i /path/to/copy/of/list_stream_card_item.xml app/src/main/res/layout-land/list_stream_card_item.xml
$ git add -A
$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        typechange: app/src/main/res/layout-land/list_stream_card_item.xml

$ git ls-files -s app/src/main/res/layout-land/*
100644 ec00c01ad0de387be75612f09a584716362a99ae 0       app/src/main/res/layout-land/activity_player_queue_control.xml
100644 793942568e4762391ceaac588c1b47f6431d00e6 0       app/src/main/res/layout-land/list_stream_card_item.xml
polymorphicshade commented 2 months ago

Excellent thank you... this has been driving me crazy!

obfusk commented 2 months ago

You should be able to remove the workaround from the CI now :)