[release-0.20] Fix "Committer identity unknown" when patching: (#8953)

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> --------- Signed-off-by: Jacob Weinstock <[email protected]> Co-authored-by: Jacob Weinstock <[email protected]>
aws · Nov 1, 2024 · 64473ed · 64473ed
1 parent 360b8be
commit 64473ed
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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="[email protected]" 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
@@ -1,4 +1,3 @@
-From f97e20029a8b34b66eb5356764b268fc527741f7 Mon Sep 17 00:00:00 2001
 From: Jacob Weinstock <[email protected]>
 Date: Thu, 31 Oct 2024 10:24:12 -0600
 Subject: [PATCH] Security update: