Skip to content

Commit

Permalink
Update to verify the diff
Browse files Browse the repository at this point in the history
  • Loading branch information
jackton1 committed Dec 17, 2022
1 parent 08b8ee2 commit 60a9d77
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions diff-sha.sh
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@ else
echo "::debug::Merge-base commit: $merge_base_commit is not valid"
done

# shellcheck disable=SC2086
git fetch $EXTRA_ARGS --progress --depth="$INPUT_FETCH_DEPTH" origin +"$TARGET_BRANCH":refs/remotes/origin/"$TARGET_BRANCH" 1>/dev/null 2>&1

# If the merge-base commit is not found merge the current branch with the target branch and return with exit code 1 if there are merge conflicts
if ! git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA$DIFF$CURRENT_SHA" 1>/dev/null 2>&1; then
# If in a detached head state, checkout the current branch
Expand Down

0 comments on commit 60a9d77

Please sign in to comment.