show alternative ways to get current branch

Author: scivision

LICENSE renamed to LICENSE.txt

@@ -1,5 +1,8 @@
 """
 Operations for Git branches
+
+git branch get name methods:
+https://stackoverflow.com/a/45028375
 """
 
 from typing import List, Tuple
@@ -9,6 +12,11 @@
 
 from .git import baddir, GITEXE
 
+BRANCH_REV = ['rev-parse', '--abbrev-ref', 'HEAD']
+BRANCH_SYM = ['symbolic-ref', '--short', 'HEAD']
+BRANCH_NAME = ['name-rev', '--name-only', 'HEAD']
+BRANCH_SIMPLE = ['branch', '--show-current']  # Git >= 2.22
+
 
 async def findbranch(mainbranch: str, rdir: Path) -> List[Tuple[Path, str]]:
     """
@@ -61,7 +69,7 @@ async def _arbiter(mainbranch: str, path: Path) -> Tuple[Path, str]:
 
 async def _worker(mainbranch: str, path: Path) -> Tuple[Path, str]:
 
-    proc = await asyncio.create_subprocess_exec(*[GITEXE, '-C', str(path), 'rev-parse', '--abbrev-ref', 'HEAD'],
+    proc = await asyncio.create_subprocess_exec(*[GITEXE, '-C', str(path)] + BRANCH_REV,
                                                 stdout=asyncio.subprocess.PIPE)
     stdout, _ = await proc.communicate()
 

gitutils/branch.py

@@ -23,7 +23,8 @@ classifiers =
   Programming Language :: Python :: 3.7
   Programming Language :: Python :: 3.8
   Topic :: Utilities
-license_file = LICENSE
+license_files =
+  LICENSE.txt
 long_description = file: README.md
 long_description_content_type = text/markdown