From 0a929f437b9989f1f3e0bb5c0781a57a4aa043a2 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 31 Oct 2024 18:24:25 -0600 Subject: [PATCH] Fix "Committer identity unknown" when patching: (#8951) * Fix "Committer identity unknown" when patching: git am is failing to apply the theme patch because amplify doesn't have a git user and email configured. This configures a user and email so the git am doesn't fail. Signed-off-by: Jacob Weinstock * Fail the make goal if the patch doesn't work: This will make sure that a patch failure doesnt fail silently. Signed-off-by: Jacob Weinstock * git patch with placeholder user and email: This allows the patch to always apply. This is needed for CI environments that don't have git user and email setup. This won't affect any global git config locally and doesn't affect the patch either. Signed-off-by: Jacob Weinstock --------- Signed-off-by: Jacob Weinstock --- docs/Makefile | 2 +- docs/patches/0001-Security-update.patch | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 5f189c7fa68c..9f7bea0dffca 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -30,7 +30,7 @@ submodule: ## Initialize the docsy theme submodule git submodule update --init --recursive submodule-apply-patches: submodule ## Apply submodule patches - cd themes/docsy; git am < ../../patches/0001-Security-update.patch; cd ../.. + cd themes/docsy; git -c user.name="none" -c user.email="none@none.org" am ../../patches/0001-Security-update.patch && cd ../.. submodule-reset: ## Reset submodules to tracked commit git submodule update --init --recursive --force diff --git a/docs/patches/0001-Security-update.patch b/docs/patches/0001-Security-update.patch index 20e01849eefe..3b41b3e8bb0d 100644 --- a/docs/patches/0001-Security-update.patch +++ b/docs/patches/0001-Security-update.patch @@ -1,4 +1,3 @@ -From f97e20029a8b34b66eb5356764b268fc527741f7 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 31 Oct 2024 10:24:12 -0600 Subject: [PATCH] Security update: