From: plenz at cis.fu-berlin.de (Julius Plenz)
Subject: [PATCH] guess default branch from HEAD
Date: Thu, 7 Apr 2011 12:59:24 +0200 [thread overview]
Message-ID: <1302173964-12520-1-git-send-email-plenz@cis.fu-berlin.de> (raw)
In-Reply-To: <20110407104958.GB1004@plenz.com>
This is a saner alternative than hardcoding the default branch to be
"master". The add_repo() function will now check for a symbolic ref in
repo_path/HEAD. If there is a suitable one, overwrite repo->defbranch
with it. Note that you'll need to strip the newline from the file (->
len-17).
If HEAD is a symbolic link pointing directly to a branch below
refs/heads/, do a readlink() instead to find the ref name.
Signed-off-by: Julius Plenz <plenz at cis.fu-berlin.de>
---
cgitrc.5.txt | 3 ++-
scan-tree.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index c3698a6..f0ef6a7 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -362,7 +362,8 @@ repo.commit-filter::
repo.defbranch::
The name of the default branch for this repository. If no such branch
exists in the repository, the first branch name (when sorted) is used
- as default instead. Default value: "master".
+ as default instead. Default value: branch pointed to by HEAD, or
+ "master" if there is no suitable HEAD.
repo.desc::
The value to show as repository description. Default value: none.
diff --git a/scan-tree.c b/scan-tree.c
index 627af1b..ae137ee 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -68,6 +68,39 @@ static char *xstrrchr(char *s, char *from, int c)
return from < s ? NULL : from;
}
+static char *guess_defbranch(const char *repo_path)
+{
+ int fd, len;
+ char buffer[256];
+ char *ref_start;
+ char *head;
+
+ head = fmt("%s/HEAD", repo_path);
+ fd = open(head, O_RDONLY);
+ if (fd == -1)
+ return xstrdup("master");
+
+ memset(buffer, 0, sizeof(buffer));
+ len = read_in_full(fd, buffer, sizeof(buffer)-1);
+ close(fd);
+
+ if(!memcmp(buffer, "ref: refs/heads/", 16))
+ return xstrndup(buffer+16, len-17);
+
+ if(strlen(buffer) == 41) {
+ /* probably contains a SHA1 sum */
+ memset(buffer, 0, sizeof(buffer));
+ if(readlink(head, buffer, sizeof(buffer)-1)) {
+ ref_start = memmem(buffer, sizeof(buffer)-1, "refs/heads/", 11);
+ if(ref_start)
+ return xstrdup(ref_start+11);
+ }
+ }
+
+ return xstrdup("master");
+}
+
+
static void add_repo(const char *base, const char *path, repo_config_fn fn)
{
struct stat st;
@@ -105,6 +138,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
*p = '\0';
repo->name = repo->url;
repo->path = xstrdup(path);
+
+ repo->defbranch = guess_defbranch(repo->path);
+
while (!owner) {
if ((pwd = getpwuid(st.st_uid)) == NULL) {
fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
--
1.7.3.1
next prev parent reply other threads:[~2011-04-07 10:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 16:03 [PATCH 1/5] " plenz
2011-03-10 16:03 ` [PATCH 2/5] get_commit_date() obtains newest commit date plenz
2011-03-10 16:03 ` [PATCH 3/5] make enable-log-linecount independent of -filecount plenz
2011-03-10 17:25 ` hjemli
2011-03-26 14:43 ` hjemli
2011-03-10 16:03 ` [PATCH 4/5] fix two encoding bugs plenz
2011-03-10 17:29 ` hjemli
2011-03-10 16:03 ` [PATCH 5/5] Add advice about scan-path in cgitrc.5.txt plenz
2011-03-10 17:33 ` hjemli
2011-03-10 17:22 ` [PATCH 1/5] guess default branch from HEAD hjemli
2011-03-16 10:53 ` plenz
2011-03-26 10:08 ` hjemli
2011-03-30 16:00 ` [PATCH v2] " plenz
2011-04-07 9:44 ` hjemli
2011-04-07 10:49 ` plenz
2011-04-07 10:59 ` plenz [this message]
2011-06-10 6:42 ` [PATCH] " jugg
2011-06-13 10:16 ` larsh
2011-06-13 10:16 ` hjemli
2011-06-16 14:59 ` plenz
2011-06-20 19:25 ` hjemli
2011-07-09 8:09 ` jugg
2011-07-13 15:10 ` plenz
2011-07-19 7:08 ` larsh
2011-07-19 9:40 ` jugg
2011-07-19 6:30 ` larsh
2011-07-19 9:35 ` jugg
2011-07-19 9:56 ` larsh
2011-07-19 10:13 ` jugg
2011-07-21 10:34 ` larsh
2011-04-07 11:05 ` [PATCH v2] " hjemli
2011-06-09 4:40 ` jugg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1302173964-12520-1-git-send-email-plenz@cis.fu-berlin.de \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).