mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-27 10:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guess the default branch based on current namespace

Browse Source 
resolve_ref_unsafe() can't be told to be namespace aware,
so we need to prepend the namespace beforehand.

Additionally, we need to add the RESOLVE_REF_NO_RECURSE flag,
since otherwise if the commit that is pointed to exists in the root namespace,
it will opt to return that rather than the value in the namespace,
presumably preferring shorter ref names to longer ones.

Signed-off-by: Richard Maw <richard.maw@gmail.com>
This commit is contained in:
Richard Maw 2016-06-25 22:42:33 +01:00
parent e407fe7213
commit d25bfb99f9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cgit.c
View File

@ -474,11 +474,17 @@ static char *guess_defbranch(void)
{ {
const char *ref; const char *ref;
unsigned char sha1[20]; unsigned char sha1[20];
char *namespaced_head = NULL;
ref = resolve_ref_unsafe("HEAD", 0, sha1, NULL); if (get_git_namespace())
if (!ref || !starts_with(ref, "refs/heads/")) namespaced_head = mkpathdup("%sHEAD", get_git_namespace());
/* NOTE: RESOLVE_REF_NO_RECURSE is required to prevent it resolving HEAD
into a ref outside of the namespace. */
ref = resolve_ref_unsafe(namespaced_head ?: "HEAD", RESOLVE_REF_NO_RECURSE, sha1, NULL);
free(namespaced_head);
if (!ref || !starts_with(strip_namespace(ref), "refs/heads/"))
return "master"; return "master";
return xstrdup(ref + 11); return xstrdup(strip_namespace(ref) + 11);
} }
/* The caller must free filename and ref after calling this. */ /* The caller must free filename and ref after calling this. */
static inline void parse_readme(const char *readme, char **filename, char **ref, struct cgit_repo *repo) static inline void parse_readme(const char *readme, char **filename, char **ref, struct cgit_repo *repo)