From b333ddfe73ce986f1b79f276bbac2c84a11d8461 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 16 Oct 2025 13:30:55 +0100 Subject: 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 --- include/get.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/get.sh b/include/get.sh index 35cf2dbf..c463bbc5 100644 --- a/include/get.sh +++ b/include/get.sh @@ -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" || \ -- cgit v1.2.1