fix: use git branch --show-current to get branch name (#252)

shenxianpeng · web-flow · commit cf9d24541334 · 2025-07-09T23:55:30.000+03:00
* fix: use git branch --show-current to get branch name

* fix: set branch name to HEAD if empty
diff --git a/commit_check/util.py b/commit_check/util.py
@@ -22,8 +22,9 @@ def get_branch_name() -> str:
     :returns: A `str` describing the current branch name.
     """
     try:
-        commands = ['git', 'rev-parse', '--abbrev-ref', 'HEAD']
-        branch_name = cmd_output(commands)
+        # Git 2.22 and above supports `git branch --show-current`
+        commands = ['git', 'branch', '--show-current']
+        branch_name = cmd_output(commands) or "HEAD"
     except CalledProcessError:
         branch_name = ''
     return branch_name.strip()
diff --git a/tests/util_test.py b/tests/util_test.py
@@ -25,7 +25,7 @@ def test_get_branch_name(self, mocker):
             retval = get_branch_name()
             assert m_cmd_output.call_count == 1
             assert m_cmd_output.call_args[0][0] == [
-                "git", "rev-parse", "--abbrev-ref", "HEAD"
+                "git", "branch", "--show-current"
             ]
             assert retval == "fake_branch_name"
 
@@ -45,7 +45,7 @@ def test_get_branch_name_with_exception(self, mocker):
             retval = get_branch_name()
             assert m_cmd_output.call_count == 1
             assert m_cmd_output.call_args[0][0] == [
-                "git", "rev-parse", "--abbrev-ref", "HEAD"
+                "git", "branch", "--show-current"
             ]
             assert retval == ""
 
