This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit c8c91e4f46c29ce59b9f4861e075a459b8e472ab Author: Brian Neradt <[email protected]> AuthorDate: Mon Dec 1 10:59:34 2025 -0600 various worktree fixes (#12705) Fix pre-commit hook installation in a worktree. This also fixes a handful of doc generation references to the .git directory to work in worktrees as well. (cherry picked from commit 21d895f5a195e1bfeb54f951a78874a5f7678c65) --- doc/ext/traffic-server.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/ext/traffic-server.py b/doc/ext/traffic-server.py index fa8942eec5..1e832b357c 100644 --- a/doc/ext/traffic-server.py +++ b/doc/ext/traffic-server.py @@ -469,8 +469,12 @@ REPO_ROOT = os.path.join(os.path.dirname(os.path.dirname(os.environ['DOCUTILSCON CONFIGURE_AC = os.path.join(REPO_ROOT, 'configure.ac') with open(CONFIGURE_AC, 'r') as f: contents = f.read() - match = re.compile(r'm4_define\(\[TS_VERSION_S],\[(.*?)]\)').search(contents) - autoconf_version = '.'.join(match.group(1).split('.', 2)[:2] + ['x']) +match = re.search(r'project\(ats VERSION ([0-9\.]+)', contents) + +if match: + release = '.'.join(match.group(1).split('.', 2)[:2] + ['x']) +else: + release = 'x.y.z' # Get the current branch the local repository is on. # Run git from the repository root to work with both normal repos and worktrees.
