From 7b31535c25995dd2f6bc5e879324b27e615d5fe6 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sat, 10 Sep 2022 13:01:57 +0200 Subject: [PATCH] git.getref: use python-git Fixes a "warning: refname is ambiguous." problem: $ git clone https://gitlab.com/joshua.tee/wx.git $ cd wx $ git rev-parse 55699 warning: refname '55699' is ambiguous. https://gitlab.com/fdroid/fdroiddata/-/commit/8760bb0ce77f4bc97e6ad7a2e244d4ad2bb0c3e3#note_1090707468 --- fdroidserver/common.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 035ee506..6e2ae762 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1252,12 +1252,10 @@ class vcs_git(vcs): def getref(self, revname='HEAD'): self.checkrepo() - p = FDroidPopen(['git', 'rev-parse', '--verify', - '{revname}^{{commit}}'.format(revname=revname)], cwd=self.local, - output=False) - if p.returncode != 0: + repo = git.Repo(self.local) + if not repo.is_valid_object(revname): return None - return p.output.strip() + return repo.commit(revname).hexsha class vcs_gitsvn(vcs):