wip: fix git merge [skip ci]

VSCodium · Oct 5, 2023 · 5e61d7d · 5e61d7d
1 parent fc7ef66
commit 5e61d7d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/prepare_vscode.sh b/prepare_vscode.sh
@@ -74,8 +74,8 @@ else
     mkdir -p .build/node-gyp
     cd .build/node-gyp
 
-    git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )[email protected]"
-    git config user.name "${GITHUB_USERNAME} CI"
+    git config --global user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )[email protected]"
+    git config --global user.name "${GITHUB_USERNAME} CI"
     git clone https://github.com/nodejs/node-gyp.git .
     git checkout v9.4.0
     git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch