From baf54e084c2cf1b7a21a195cd05ebf6061669a02 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 3 Dec 2019 14:29:16 -0600 Subject: [PATCH 1/2] adding it --- lib/linter.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/linter.sh b/lib/linter.sh index acef8187..787c61bd 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -2008,7 +2008,7 @@ BuildFileList() ##################################################################### # Switch codebase back to master to get a list of all files changed # ##################################################################### - SWITCH_CMD=$(cd "$GITHUB_WORKSPACE" || exit; git checkout master; git pull; git fetch 2>&1) + SWITCH_CMD=$(cd "$GITHUB_WORKSPACE" || exit; git pull; git checkout origin/master 2>&1) ####################### # Load the error code # @@ -2061,7 +2061,7 @@ BuildFileList() # Print file # ############## echo "File:[$FILE]" - + ########################### # Get the files extension # ########################### From ad2cb9d6a391a536951d59df2a89cd54725e7b58 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 3 Dec 2019 14:30:50 -0600 Subject: [PATCH 2/2] fix command --- lib/linter.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linter.sh b/lib/linter.sh index 787c61bd..4dcaf6b6 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -2008,7 +2008,7 @@ BuildFileList() ##################################################################### # Switch codebase back to master to get a list of all files changed # ##################################################################### - SWITCH_CMD=$(cd "$GITHUB_WORKSPACE" || exit; git pull; git checkout origin/master 2>&1) + SWITCH_CMD=$(cd "$GITHUB_WORKSPACE" || exit; git pull; git checkout master origin/master 2>&1) ####################### # Load the error code #