mirror of
https://github.com/luckeyfaraday/bo3-workshop-ps4.git
synced 2026-10-06 08:00:24 +02:00
Make the converter patch apply regardless of git line-ending settings
The patch was made against CRLF checkouts; upstream stores LF. Keep the patch LF and byte-exact (.gitattributes), and check upstream out with core.autocrlf=false in build-ffport.ps1. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
3353d9688d
commit
d0a3c3b34d
2 files changed
+9
-1
No files matched your search
@@ -0,0 +1,4 @@
|
||||
# Keep the patch byte-exact: it applies to PS4-BO3-Customs checked out with LF (see scripts/build-ffport.ps1).
|
||||
*.diff -text
|
||||
*.py text eol=lf
|
||||
*.ps1 text eol=crlf
|
||||
@@ -12,11 +12,15 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
$root = Resolve-Path "$PSScriptRoot\.."
|
||||
|
||||
# The patch is against upstream's files as stored (LF), whatever this machine's core.autocrlf says.
|
||||
if (-not (Test-Path "$Source\.git")) {
|
||||
git clone --quiet https://github.com/ItsJokerZz/PS4-BO3-Customs $Source
|
||||
git -c core.autocrlf=false clone --quiet https://github.com/ItsJokerZz/PS4-BO3-Customs $Source
|
||||
}
|
||||
git -C $Source config core.autocrlf false
|
||||
git -C $Source fetch --quiet --tags
|
||||
git -C $Source checkout --quiet --force $Tag
|
||||
git -C $Source rm --cached -r -q .
|
||||
git -C $Source reset --quiet --hard $Tag
|
||||
git -C $Source clean -fdq
|
||||
|
||||
git -C $Source apply --whitespace=nowarn "$root\patches\ffporter-fixes.diff"
|
||||
|
||||
Reference in new issue
Block a user