get.sh: use --keep-cr on git-am

Some repositories might use CR-LF line endings. This option
keeps Git from mangling patches when merging.

Repositories that don't do this, such as ALL repositories
currently used by xbmk, will be unaffected by this change.

This is being done in preparation for importing MrChromebox
edk2, as Intel's own edk2 repository on GitHub uses these.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-10-16 13:30:55 +01:00
parent d83dd506c2
commit b333ddfe73

View File

@@ -373,7 +373,7 @@ tmpclone()
while read -r tmpclone_patch; do
( x_ git -C "$2" am "$tmpclone_patch" ) || \
( x_ git -C "$2" am --keep-cr "$tmpclone_patch" ) || \
err "Can't apply '$tmpclone_patch'" "tmpclone" "$@"; :
done < "$tmpclone_patchlist" || \