From 183d221124b506df4a3d227bfb81488eb8609b3e Mon Sep 17 00:00:00 2001 From: Simon Westphahl Date: Fri, 24 Mar 2023 11:34:48 +0100 Subject: Log commit SHA when getting files from repo From the previous log messages related to a cat job it wasn't clear which HEAD SHA was used to get the file content. This change adds a log message to the `getFiles()` method that contains the HEAD commit SHA. Change-Id: I02a3a97f9b3dfa70f6e55954ea6ef365289f0046 --- zuul/merger/merger.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py index 1df833bc5..845925bfa 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py @@ -722,9 +722,11 @@ class Repo(object): ret = {} repo = self.createRepoObject(zuul_event_id) if branch: - tree = repo.heads[branch].commit.tree + head = repo.heads[branch].commit else: - tree = repo.commit(commit).tree + head = repo.commit(commit) + log.debug("Getting files for %s at %s", self.local_path, head.hexsha) + tree = head.tree for fn in files: if fn in tree: if tree[fn].type != 'blob': -- cgit v1.2.1