From e691383178085f403608b3ad31595ea2ac9388e6 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 23 Aug 2020 19:44:40 +0200 Subject: [PATCH] git is old on saperlipopette --- list_builder.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/list_builder.py b/list_builder.py index 7da1fded..6f93e79c 100755 --- a/list_builder.py +++ b/list_builder.py @@ -99,9 +99,14 @@ def refresh_cache(app, infos): try: git("remote set-url origin " + infos["url"], in_folder=app_cache_folder(app)) - current_branch = git("branch --show-current", in_folder=app_cache_folder(app)) + # With git >= 2.22 + # current_branch = git("branch --show-current", in_folder=app_cache_folder(app)) + current_branch = git("rev-parse --abbrev-ref HEAD", in_folder=app_cache_folder(app)) if current_branch != branch: - all_branches = git("branch --format=%(refname:short)", in_folder=app_cache_folder(app)).split() + # With git >= 2.13 + # all_branches = git("branch --format=%(refname:short)", in_folder=app_cache_folder(app)).split() + all_branches = git("branch", in_folder=app_cache_folder(app)).split() + all_branches.remove('*') if branch not in all_branches: git("remote set-branches --add origin %s" % branch, in_folder=app_cache_folder(app)) git("fetch origin %s:%s" % (branch, branch), in_folder=app_cache_folder(app))