From 5ab7151dd60e1e69ad4fbdd68bdb3208c2441d38 Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Tue, 1 Nov 2022 21:30:06 +0100 Subject: [PATCH] Fetch all refs, then use HEAD~ to get previous merge, then checkout back to current commit --- hack/get_impacted_targets.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hack/get_impacted_targets.sh b/hack/get_impacted_targets.sh index f8bd45d..e3ef7d3 100755 --- a/hack/get_impacted_targets.sh +++ b/hack/get_impacted_targets.sh @@ -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