From bf6cbc1df71dbd0f5bb2fb806611c802325faa13 Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Mon, 24 Aug 2020 22:03:09 +0800 Subject: [PATCH] build(third_party): fix git apply issue --- third_party/apply-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/apply-patches.sh b/third_party/apply-patches.sh index 380fd239e..e92406606 100755 --- a/third_party/apply-patches.sh +++ b/third_party/apply-patches.sh @@ -9,7 +9,7 @@ function apply_cpuinfo_patches() { git rebase --abort || true git reset --hard # Use git apply instead of git am to prevent git require name in .gitconfig - git apply 0001-fix-arm-linux-fix-uclibc-build-error.patch + GIT_AUTHOR_NAME='patcher' GIT_AUTHOR_EMAIL='patcher@nobody.com' git apply 0001-fix-arm-linux-fix-uclibc-build-error.patch rm *.patch popd >/dev/null else -- GitLab