Fetch all refs, then use HEAD~ to get previous merge, then checkout back to current commit

This commit is contained in:
Mustafa Gezen 2022-11-01 21:30:06 +01:00
parent d21a8a3f37
commit 5ab7151dd6
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1

View File

@ -9,10 +9,17 @@ workspace_dir="$(pwd)"
$BAZEL_B //:bazel-diff
# Fetch all refs
git fetch --all
# Starting point
STARTING_COMMIT="$(git rev-parse HEAD)"
# Find base and target hash
BASE_HASH="$PULL_BASE_SHA"
TARGET_HASH="$PULL_PULL_SHA"
if [[ -z "$TARGET_HASH" ]]; then
BASE_HASH="$(git log "HEAD@{1}" --pretty=format:"%H" --merges -n 1)"
BASE_HASH="$(git log "HEAD~" --pretty=format:"%H" --merges -n 1)"
TARGET_HASH="$PULL_BASE_SHA"
fi
@ -29,4 +36,5 @@ bazel-bin/bazel-diff generate-hashes -w "$workspace_dir" -b "$bazel_bin" ending_
# Get impacted targets
bazel-bin/bazel-diff get-impacted-targets -sh starting_hashes_json -fh ending_hashes_json -o impacted_targets
# Checkout back to starting commit
git checkout "$STARTING_COMMIT" --quiet