diff --git a/tools/cache-zulip-git-version b/tools/cache-zulip-git-version index b025a6b4a7..87d282372a 100755 --- a/tools/cache-zulip-git-version +++ b/tools/cache-zulip-git-version @@ -5,7 +5,7 @@ cd "$(dirname "$0")/.." remote="$(git config zulip.zulipRemote)" || remote=upstream { git describe --always --tags --match='[0-9]*' - branches="$(git for-each-ref --format='%(objectname)' "refs/remotes/$remote/main" "refs/remotes/$remote/*.x")" + branches="$(git for-each-ref --format='%(objectname)' "refs/remotes/$remote/main" "refs/remotes/$remote/*.x" "refs/remotes/$remote/*-branch")" mapfile -t branches <<<"$branches" if merge_base="$(git merge-base -- HEAD "${branches[@]}")"; then git describe --always --tags --match='[0-9]*' -- "$merge_base"