From a1b01b2513510f8f93f7f8ca39969002cd496a19 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Wed, 3 Dec 2008 17:34:23 +0100 Subject: [PATCH 1/5] ui-log: try to disambiguate ref names The 'h' querystring parameter in cgit is normally used to specify a branch (i.e. a ref below refs/heads/), but if a repository contains a tag with the same name as a branch the output from ui-log would use the tag as start-revision. This patch tries to fix the issue by checking if the specified ref is valid as a branch name; if so, the full refname is used in the call to setup_revisions(). Noticed-by: Takamori Yamaguchi Signed-off-by: Lars Hjemli --- ui-log.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/ui-log.c b/ui-log.c index 8dd8b89..d212984 100644 --- a/ui-log.c +++ b/ui-log.c @@ -64,18 +64,31 @@ void print_commit(struct commit *commit) cgit_free_commitinfo(info); } +static const char *disambiguate_ref(const char *ref) +{ + unsigned char sha1[20]; + const char *longref; + + longref = fmt("refs/heads/%s", ref); + if (get_sha1(longref, sha1) == 0) + return longref; + + return ref; +} void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) { struct rev_info rev; struct commit *commit; - const char *argv[] = {NULL, tip, NULL, NULL, NULL}; + const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; int argc = 2; int i, columns = 3; if (!tip) - argv[1] = ctx.qry.head; + tip = ctx.qry.head; + + argv[1] = disambiguate_ref(tip); if (grep && pattern && (!strcmp(grep, "grep") || !strcmp(grep, "author") || From 97fdac1608a0b4b07aae26b144c6ee7991e6c5eb Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Sat, 15 Nov 2008 18:26:32 +0000 Subject: [PATCH 2/5] Extra cygwin-specific changes Signed-off-by: Ramsay Jones Signed-off-by: Lars Hjemli --- Makefile | 23 +++++++++++++++++++++++ cgit.h | 6 ------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2107610..dc98072 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,26 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 # -include cgit.conf +# Define NO_STRCASESTR if you don't have strcasestr. +# +# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). +# + +#-include config.mak + +# +# Platform specific tweaks +# + +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') + +ifeq ($(uname_O),Cygwin) + NO_STRCASESTR = YesPlease + NEEDS_LIBICONV = YesPlease +endif + # # Define a way to invoke make in subdirs quietly, shamelessly ripped # from git.git @@ -96,6 +116,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' ifdef NO_ICONV CFLAGS += -DNO_ICONV endif +ifdef NO_STRCASESTR + CFLAGS += -DNO_STRCASESTR +endif cgit: $(OBJECTS) libgit $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) diff --git a/cgit.h b/cgit.h index 91db98a..92f0c5a 100644 --- a/cgit.h +++ b/cgit.h @@ -233,11 +233,5 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); -/* libgit.a either links against or compiles its own implementation of - * strcasestr(), and we'd like to reuse it. Simply re-declaring it - * seems to do the trick. - */ -extern char *strcasestr(const char *haystack, const char *needle); - #endif /* CGIT_H */ From a5e899e4c786e2ed7f58874d66956bf196cef8df Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Fri, 5 Dec 2008 18:47:16 +0100 Subject: [PATCH 3/5] Makefile: allow cgit.conf to override platform-specific tweaks If the makefile doesn't automatically define the correct build variables it is nice to be able to define them explicitly. Signed-off-by: Lars Hjemli --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index dc98072..2e51c31 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,6 @@ SHA1_HEADER = GIT_VER = 1.6.0.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 -# -# Let the user override the above settings. -# --include cgit.conf - # Define NO_STRCASESTR if you don't have strcasestr. # # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). @@ -32,6 +27,11 @@ ifeq ($(uname_O),Cygwin) NEEDS_LIBICONV = YesPlease endif +# +# Let the user override the above settings. +# +-include cgit.conf + # # Define a way to invoke make in subdirs quietly, shamelessly ripped # from git.git From 7115f7d257b5e3fb5d5d7ad6299214506fb35042 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Fri, 5 Dec 2008 19:04:17 +0100 Subject: [PATCH 4/5] ui-repolist: avoid build warning for strcasestr(3) The non-standard function strcasestr is only defined if _GNU_SOURCE has also been defined. Signed-off-by: Lars Hjemli --- ui-repolist.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui-repolist.c b/ui-repolist.c index c23232c..2324273 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -6,6 +6,10 @@ * (see COPYING for full license text) */ +/* This is needed for strcasestr to be defined by */ +#define _GNU_SOURCE 1 +#include + #include #include "cgit.h" From 14b4e108a73b09ce9b6df2c7f2e417305ad68cf4 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Fri, 5 Dec 2008 19:10:28 +0100 Subject: [PATCH 5/5] parsing.c: enable builds with NO_ICONV defined Signed-off-by: Lars Hjemli --- parsing.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/parsing.c b/parsing.c index c8f3048..f3f3b15 100644 --- a/parsing.c +++ b/parsing.c @@ -96,6 +96,9 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date) return p; } +#ifdef NO_ICONV +#define reencode(a, b, c) +#else const char *reencode(char **txt, const char *src_enc, const char *dst_enc) { char *tmp; @@ -110,6 +113,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) } return *txt; } +#endif struct commitinfo *cgit_parse_commit(struct commit *commit) {