git: don't assume default branch is named master

jelmer · Sep 28, 2024 · 4ee2c72 · 4ee2c72
1 parent cec7094
commit 4ee2c72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/xandikos/store/git.py b/xandikos/store/git.py
@@ -211,12 +211,12 @@ def __init__(
         self,
         repo,
         *,
-        ref: bytes = b"refs/heads/master",
+        ref: bytes = b"HEAD",
         check_for_duplicate_uids=True,
         **kwargs,
     ) -> None:
         super().__init__(MemoryIndex(), **kwargs)
-        self.ref = ref
+        self.ref = repo.refs.follow(ref)[0][-1]
         self.repo = repo
         # Maps uids to (sha, fname)
         self._uid_to_fname: dict[str, tuple[bytes, str]] = {}

diff --git a/xandikos/tests/test_web.py b/xandikos/tests/test_web.py
@@ -156,7 +156,7 @@ def test_git_refs(self):
         self.store.import_one("foo.ics", "text/calendar", [EXAMPLE_VCALENDAR1])
         app = XandikosApp(self.backend, "user")
 
-        default_branch = b"refs/heads/master"
+        default_branch = self.store.repo.refs.follow(b"HEAD")[0][-1]
         commit_hash = self.store.repo.refs[default_branch]
 
         environ = {"PATH_INFO": "/c/.git/info/refs", "REQUEST_METHOD": "GET", "QUERY_STRING": ""}