Fixed bug with setting the exit status

tj-actions · Sep 3, 2022 · 618e703 · 618e703
1 parent 1faa996
commit 618e703
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/diff-sha.sh b/diff-sha.sh
@@ -23,7 +23,7 @@ function __version() {
   echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }';
 }
 
-GIT_VERSION=$(git --version | awk '{print $3}'); exit_status=$?
+GIT_VERSION=$(git --version | awk '{print $3}') && exit_status=$? || exit_status=$?
 
 if [[ $exit_status -ne 0 ]]; then
   echo "::error::git not installed"
@@ -40,7 +40,7 @@ fi
 echo "::debug::Getting HEAD SHA..."
 
 if [[ -z $INPUT_SHA ]]; then
-  CURRENT_SHA=$(git rev-list -n 1 "HEAD" 2>&1); exit_status=$?
+  CURRENT_SHA=$(git rev-list -n 1 "HEAD" 2>&1) && exit_status=$? || exit_status=$?
 else
   CURRENT_SHA=$INPUT_SHA; exit_status=$?
 fi
@@ -63,10 +63,10 @@ if [[ -z $GITHUB_BASE_REF ]]; then
   echo "::debug::GITHUB_BASE_REF unset using $TARGET_BRANCH..."
 
   if [[ -z $INPUT_BASE_SHA ]]; then
-    git fetch --no-tags -u --progress origin --depth=2 "${TARGET_BRANCH}":"${TARGET_BRANCH}"; exit_status=$?
+    git fetch --no-tags -u --progress origin --depth=2 "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
 
     if [[ $(git rev-list --count "HEAD") -gt 1 ]]; then
-      PREVIOUS_SHA=$(git rev-parse "@~1" 2>&1); exit_status=$?
+      PREVIOUS_SHA=$(git rev-parse "@~1" 2>&1) && exit_status=$? || exit_status=$?
       echo "::debug::Previous SHA: $PREVIOUS_SHA"
     else
       PREVIOUS_SHA=$CURRENT_SHA; exit_status=$?
@@ -76,13 +76,13 @@ if [[ -z $GITHUB_BASE_REF ]]; then
     fi
   else
     PREVIOUS_SHA=$INPUT_BASE_SHA; exit_status=$?
-    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1); exit_status=$?
+    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1) && exit_status=$? || exit_status=$?
     echo "::debug::Previous SHA: $PREVIOUS_SHA"
     echo "::debug::Target branch: $TARGET_BRANCH"
   fi
 
   echo "Verifying the commit SHA: $PREVIOUS_SHA"
-  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1; exit_status=$?
+  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
 
   if [[ $exit_status -ne 0 ]]; then
     echo "::error::Unable to locate the previous sha: $PREVIOUS_SHA"
@@ -98,24 +98,24 @@ else
   if [[ -z $INPUT_BASE_SHA ]]; then
     if [[ "$INPUT_USE_FORK_POINT" == "true" ]]; then
       echo "::debug::Getting fork point..."
-      git fetch --no-tags -u --progress origin "${TARGET_BRANCH}":"${TARGET_BRANCH}"; exit_status=$?
-      PREVIOUS_SHA=$(git merge-base --fork-point "${TARGET_BRANCH}" "$(git name-rev --name-only "$CURRENT_SHA")"); exit_status=$?
+      git fetch --no-tags -u --progress origin "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
+      PREVIOUS_SHA=$(git merge-base --fork-point "${TARGET_BRANCH}" "$(git name-rev --name-only "$CURRENT_SHA")") && exit_status=$? || exit_status=$?
       echo "::debug::Previous SHA: $PREVIOUS_SHA"
     else
-      git fetch --no-tags -u --progress origin --depth=1 "${TARGET_BRANCH}":"${TARGET_BRANCH}"; exit_status=$?
-      PREVIOUS_SHA=$(git rev-list -n 1 "${TARGET_BRANCH}" 2>&1); exit_status=$?
+      git fetch --no-tags -u --progress origin --depth=1 "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
+      PREVIOUS_SHA=$(git rev-list -n 1 "${TARGET_BRANCH}" 2>&1) && exit_status=$? || exit_status=$?
       echo "::debug::Previous SHA: $PREVIOUS_SHA"
     fi
   else
-    git fetch --no-tags -u --progress origin --depth=1 "$(git rev-parse --verify "$INPUT_BASE_SHA")"; exit_status=$?
+    git fetch --no-tags -u --progress origin --depth=1 "$(git rev-parse --verify "$INPUT_BASE_SHA")" && exit_status=$? || exit_status=$?
     PREVIOUS_SHA=$INPUT_BASE_SHA
-    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1); exit_status=$?
+    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1) && exit_status=$? || exit_status=$?
     echo "::debug::Previous SHA: $PREVIOUS_SHA"
     echo "::debug::Target branch: $TARGET_BRANCH"
   fi
 
   echo "::debug::Verifying commit SHA..."
-  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1; exit_status=$?
+  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
 
   if [[ $exit_status -ne 0 ]]; then
     echo "::error::Unable to locate the previous sha: $PREVIOUS_SHA"