about summary refs log tree commit diff
path: root/nix/buildkite/fetch-parent-targets.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-01-20T18·11+0300
committerclbot <clbot@tvl.fyi>2022-01-20T19·00+0000
commit16d72933fca2affcf7bdd42af5e3e02dc7770820 (patch)
tree9755d20c4d56ebe470f2f9608c5816dcdfb71de9 /nix/buildkite/fetch-parent-targets.sh
parentac7e989571df83bd30662ec88ba97d6102116acb (diff)
chore(nix/buildkite): Drop `--fork-point` parameter r/3651
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 <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'nix/buildkite/fetch-parent-targets.sh')
-rwxr-xr-xnix/buildkite/fetch-parent-targets.sh2
1 files changed, 1 insertions, 1 deletions
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")