From 16d72933fca2affcf7bdd42af5e3e02dc7770820 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 20 Jan 2022 21:11:59 +0300 Subject: chore(nix/buildkite): Drop `--fork-point` parameter The --fork-point parameter is dependent on reflog data which may get garbage collected. This can lead to flaky behaviour where it returns no results and fails if `git gc` recently ran (Buildkite will do this occasionally). Though the parameter is semantically closer to what we're looking for, the output is *usually* the same commit since we're not dealing with more than one thing to compare. Change-Id: Idc31e7a26fda2b7113edfa162d9d3811b1a01bf6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5032 Tested-by: BuildkiteCI Autosubmit: tazjin Reviewed-by: sterni --- nix/buildkite/fetch-parent-targets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nix') diff --git a/nix/buildkite/fetch-parent-targets.sh b/nix/buildkite/fetch-parent-targets.sh index 9a8fecd1f460..ca65646abdc5 100755 --- a/nix/buildkite/fetch-parent-targets.sh +++ b/nix/buildkite/fetch-parent-targets.sh @@ -17,7 +17,7 @@ set -ueo pipefail git fetch -v origin "${BUILDKITE_PIPELINE_DEFAULT_BRANCH}" -FIRST=$(git merge-base --fork-point FETCH_HEAD "${BUILDKITE_COMMIT}") +FIRST=$(git merge-base FETCH_HEAD "${BUILDKITE_COMMIT}") SECOND=$(git rev-parse "$FIRST~1") THIRD=$(git rev-parse "$FIRST~2") -- cgit 1.4.1