upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-02-03 20:40:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

apidiff: autodetect remote and default branch

Browse source
This commit is contained in:
Benjamin Elder 2025-11-20 16:48:02 -08:00
parent 5bcb759973
commit bb2899fc4a
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hack/apidiff.sh
View file

@ -98,7 +98,16 @@ if [[ -z "${base}" && -n "${PULL_BASE_SHA:-}" && -n "${PULL_PULL_SHA:-}" ]]; the
exit 1
fi
elif [[ -z "${base}" ]]; then
if ! base="$(git merge-base origin/master "${target:-HEAD}")"; then
# origin is the default remote, but we encourage our contributors
# to have both origin (their fork) and upstream, if upstream is present
# then prefer upstream
# if they have called it something else, there's no good way to be sure ...
remote='origin'
if git remote | grep -q 'upstream'; then
remote='upstream'
fi
default_branch="$(git rev-parse --abbrev-ref "${remote}"/HEAD | cut -d/ -f2)"
if ! base="$(git merge-base "${remote}/${default_branch}" "${target:-HEAD}")"; then
echo >&2 "Could not determine default base revision. -r must be used explicitly."
exit 1
fi