From 8c92787e3219ff162858131b3c68288a00f26389 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 15 Apr 2023 13:15:02 +1000 Subject: [PATCH] Tools: size_compare_branches: allow use in detached-head state --- Tools/scripts/size_compare_branches.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Tools/scripts/size_compare_branches.py b/Tools/scripts/size_compare_branches.py index 092e718c79..2f9f38239c 100755 --- a/Tools/scripts/size_compare_branches.py +++ b/Tools/scripts/size_compare_branches.py @@ -62,7 +62,7 @@ class SizeCompareBranches(object): extra_hwdef_branch=[], extra_hwdef_master=[]): if branch is None: - branch = self.find_current_git_branch() + branch = self.find_current_git_branch_or_sha1() self.master_branch = master_branch self.branch = branch @@ -220,8 +220,16 @@ class SizeCompareBranches(object): returncode, cmd_list) return output - def find_current_git_branch(self): - output = self.run_git(["symbolic-ref", "--short", "HEAD"]) + def find_current_git_branch_or_sha1(self): + try: + output = self.run_git(["symbolic-ref", "--short", "HEAD"]) + output = output.strip() + return output + except subprocess.CalledProcessError: + pass + + # probably in a detached-head state. Get a sha1 instead: + output = self.run_git(["rev-parse", "--short", "HEAD"]) output = output.strip() return output