refactor github actions that use git

.github/workflows/merge-upstream.yml

@@ -17,4 +17,6 @@ jobs:
           ref: upstream-patched
           fetch-depth: 0
           ssh-key: ${{secrets.DEPLOY_KEY}}
-      - run: bash -x scripts/upgrade-safe/merge-upstream.sh
+      - run: bash scripts/upgrade-safe/git-user-config.sh
+      - run: bash scripts/upgrade-safe/merge-upstream.sh
+      - run: git push

.github/workflows/transpile.yml

@@ -28,5 +28,6 @@ jobs:
           restore-keys: npm-v2-
       - run: npm ci
         if: steps.cache.outputs.cache-hit != 'true'
+      - run: bash scripts/upgrade-safe/git-user-config.sh
       - run: bash scripts/upgrade-safe/transpile-branch.sh master origin/master
       - run: git push origin master

scripts/upgrade-safe/merge-upstream.sh

@@ -2,8 +2,5 @@
 
 set -euo pipefail -x
 
-bash scripts/upgrade-safe/git-user-config.sh
-
 git fetch 'https://github.com/OpenZeppelin/openzeppelin-contracts.git'
 git merge FETCH_HEAD -m 'Merge upstream openzeppelin-contracts into upstream-patched'
-git push

scripts/upgrade-safe/transpile-branch.sh

@@ -13,7 +13,6 @@ branch="$1"
 base="${2:-}"
 
 bash scripts/upgrade-safe/transpile.sh
-bash scripts/upgrade-safe/git-user-config.sh
 
 commit="$(git rev-parse --short HEAD)"