From ac3bad798688ddf124b7d83a8e4fced59a1a83a7 Mon Sep 17 00:00:00 2001 From: Adam Ormsby Date: Sun, 17 Jan 2021 21:17:08 -0500 Subject: [PATCH] Fix user/email config The variables were swapped for some reason. Fixed now. --- upstream-sync.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/upstream-sync.sh b/upstream-sync.sh index cb09fc9..fb764ec 100755 --- a/upstream-sync.sh +++ b/upstream-sync.sh @@ -11,12 +11,12 @@ config_git() { ORIG_EMAIL=$(git config --global --get --default="null" user.email) ORIG_PULL_CONFIG=$(git config --global --get --default="null" pull.rebase) - if [ "${INPUT_GIT_EMAIL}" != "null" ]; then - git config --global user.name "${INPUT_GIT_EMAIL}" + if [ "${INPUT_GIT_USER}" != "null" ]; then + git config --global user.name "${INPUT_GIT_USER}" fi - if [ "${INPUT_GIT_USER}" != "null" ]; then - git config --global user.email "${INPUT_GIT_USER}" + if [ "${INPUT_GIT_EMAIL}" != "null" ]; then + git config --global user.email "${INPUT_GIT_EMAIL}" fi if [ "${INPUT_GIT_PULL_REBASE_CONFIG}" != "null" ]; then