Git file patches don't work properly when rebuilding/applying

[Toffikk]

I discovered this bug when playing around with file/git patch conversion
Turns out that when you try to rebuild patches after changing the gitFilePatches to true property in the fork-server/build.gradle.kts when you try rebuilding to convert your patches it fails on the apply* tasks

Example output of the error:

I assume this is a bug since when using -x pufferfish:server:applyMinecraft(type patch)Patches it rebuilds and converts them to regular git patches properly, however it doesn't occur when going from git patches -> file patches in my testing
this was first brought up in the #build-tooling-help channel on the paper discord

[Toffikk]

Also it seems to fail to apply server file patches properly afterwards when turned to git

#note - the corrupt patch at line 3 also occurs when rebuilding without that excluding

[mfnalex]

I am experiencing a similar (or same?) issue when trying to rebuild patches for Paper.

Here's the output of gradlew rebuildPatches --stacktrace: https://pastebin.com/BUCPE3HH

I have already provided more information here: PaperMC/Paper#13024

Any solution?

[lynxplay]

Run gradlew -Dpaperweight.debug=true rebuildPatches and share the output.

[mfnalex]

Thank you @lynxplay for debugging this with me. My issue was "fetch.pruneTags" in my git config - it must not be set to true.

[lynxplay]

#341 exists, tho I do not know if this is a fix for this issue as the screenshots did not include the paperweight.debug output.

[Toffikk]

For reproduction of my issue you can just clone the v2-fork-of-fork branch and possibly the normal v2 fork too and change gitFilePatches to true in the server build file after which you run ./gradlew rebuildAllServerPatches. I think this issue is happening because the fork-server build file also applies to upstream when you change it and as such the changes propagate further up, so when you enable git file patches, paperweight thinks that upstream should also apply its file patches as such, except upstream has normal file patches and not git ones so the apply fails as it tries to apply them the git way and not the file way. As for rebuild it also fails since rebuilding causes re-apply of upstream (even if the changes are not copied to the source dirs in your fork) which fails for the aforementioned reason.

Here are logs ran with --stacktrace and -Dpaperweight.debug=true when rebuilding right after the change
https://pastes.dev/nyxRPr55Mz

And apply logs right after the change:
https://pastes.dev/O8YSBDpLnG

The interesting thing about this is that it fails on upstream resource patches but not on source patches (which apply) but then when you run ./gradlew applyMinecraftPatches (!!! this is important because it allows to skip tasks whereas applyAllPatches doesnt?) with -x :forky-server:applyPaperMinecraftResourcePatches it fails on source patches

https://pastes.dev/f0IpFwkZud

[Toffikk]

For the record i don't have prune tags enabled in my git config
Also a workaround for this is to just run the apply and rebuild tasks with -x and every upstream task it seems to provide the right repo anyway. seems like the wiring here is kinda whacky and should be decoupled a bit maybe