From 350f0478da1c1a966b9e92e2b20db5b2872ef20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Thu, 30 Jul 2020 17:59:44 +0200 Subject: [PATCH] Return the right non-'master' default-branch link in RSS feeds --- gitsrht/blueprints/repo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitsrht/blueprints/repo.py b/gitsrht/blueprints/repo.py index 502c821..737e258 100644 --- a/gitsrht/blueprints/repo.py +++ b/gitsrht/blueprints/repo.py @@ -387,6 +387,7 @@ def log_rss(owner, repo, ref): if not isinstance(commit, pygit2.Commit): abort(404) commits = get_log(git_repo, commit) + default_branch = git_repo.default_branch_name() repo_name = f"{repo.owner.canonical_name}/{repo.name}" title = f"{repo_name} log" @@ -394,7 +395,7 @@ def log_rss(owner, repo, ref): link = cfg("git.sr.ht", "origin") + url_for("repo.log", owner=repo.owner.canonical_name, repo=repo.name, - ref=ref if ref != "master" else None) + ref=ref if ref != default_branch else None) return generate_feed(repo, commits, title, link, description) -- 2.38.4