upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-07-07 08:51:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support detached HEAD in cherry_pick_pull.sh

Browse source 
When the repo is in a detached HEAD state (`git checkout origin/master`)
the cherrypick script fails with:

  fatal: ref HEAD is not a symbolic ref

because HEAD isn't pointing at a specific branch. The script only needs
the current branch in order to return the user to the branch afterwards.
We can fallback to tracking the detached HEAD commit so the script
returns the user back to the same commit.
This commit is contained in:
Peter Rifel 2026-05-07 20:02:17 -05:00
parent 1445342fc9
commit 1fb549b4fe
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/cherry_pick_pull.sh
View file

@ -29,7 +29,7 @@ REPO_ROOT="$(git rev-parse --show-toplevel)"
declare -r REPO_ROOT
cd "${REPO_ROOT}"
STARTINGBRANCH=$(git symbolic-ref --short HEAD)
STARTINGBRANCH=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse HEAD)
declare -r STARTINGBRANCH
declare -r REBASEMAGIC="${REPO_ROOT}/.git/rebase-apply"
DRY_RUN=${DRY_RUN:-""}