Skip to content

DAOS-19413 cq: update githooks/get_branch to 2.6+ #18794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daltonbohning wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

DAOS-19413 cq: update githooks/get_branch to 2.6+ #18794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions utils/githooks/get_branch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# find the base branch of the current branch
# base branches can be master, release/2.4+, release/3+
# base branches can be master, release/2.6+, release/3+
# or optionally branches passed into $1
set -eu -o pipefail

Expand All @@ -28,7 +28,7 @@ for origin in $(git remote); do
while IFS= read -r base; do
builtin_bases+=("$base")
done < <(echo "master"
git branch -r | sed -ne "/^ $origin\\/release\\/\(2.[4-9]\|[3-9]\)/s/^ $origin\\///p")
git branch -r | sed -ne "/^ $origin\\/release\\/\(2.[6-9]\|[3-9]\)/s/^ $origin\\///p")
export ORIGIN="${origin}"
export find_branches
readarray -t branches <<< "$(find_branches)"
Expand Down
Loading