From 6d7552bc072599313ef423d69156d824c075572a Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 22 Aug 2010 13:29:57 +0200 Subject: Use GIT-1.7.2.2 Signed-off-by: Lars Hjemli --- Makefile | 4 ++-- cgit.c | 2 +- git | 2 +- ui-commit.c | 2 +- ui-log.c | 2 +- ui-plain.c | 2 +- ui-stats.c | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 3e5a38d..2a15469 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) CGIT_CONFIG = /etc/cgitrc CACHE_ROOT = /var/cache/cgit SHA1_HEADER = -GIT_VER = 1.7.0 +GIT_VER = 1.7.2.2 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 INSTALL = install @@ -71,7 +71,7 @@ endif $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread OBJECTS = OBJECTS += cache.o OBJECTS += cgit.o diff --git a/cgit.c b/cgit.c index 4f2c752..d6146e2 100644 --- a/cgit.c +++ b/cgit.c @@ -22,7 +22,7 @@ void add_mimetype(const char *name, const char *value) { struct string_list_item *item; - item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); + item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); item->util = xstrdup(value); } diff --git a/git b/git index e923eae..8c67c39 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit e923eaeb901ff056421b9007adcbbce271caa7b6 +Subproject commit 8c67c392e1620fc3b749aa9e0b8da13bd84226f8 diff --git a/ui-commit.c b/ui-commit.c index 45af450..2b4f677 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -36,7 +36,7 @@ void cgit_print_commit(char *hex, const char *prefix) } info = cgit_parse_commit(commit); - get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); + format_note(NULL, sha1, ¬es, PAGE_ENCODING, 0); load_ref_decorations(DECORATE_FULL_REFS); diff --git a/ui-log.c b/ui-log.c index 7f38d2a..0536b23 100644 --- a/ui-log.c +++ b/ui-log.c @@ -112,7 +112,7 @@ void print_commit(struct commit *commit) html("\n"); if (ctx.qry.showmsg) { struct strbuf notes = STRBUF_INIT; - get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); + format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); if (ctx.repo->enable_log_filecount) { cols++; diff --git a/ui-plain.c b/ui-plain.c index da76406..1b2b672 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -34,7 +34,7 @@ static void print_object(const unsigned char *sha1, const char *path) ctx.page.mimetype = NULL; ext = strrchr(path, '.'); if (ext && *(++ext)) { - mime = string_list_lookup(ext, &ctx.cfg.mimetypes); + mime = string_list_lookup(&ctx.cfg.mimetypes, ext); if (mime) ctx.page.mimetype = (char *)mime->util; } diff --git a/ui-stats.c b/ui-stats.c index bdaf9cc..50c2540 100644 --- a/ui-stats.c +++ b/ui-stats.c @@ -175,7 +175,7 @@ static void add_commit(struct string_list *authors, struct commit *commit, info = cgit_parse_commit(commit); tmp = xstrdup(info->author); - author = string_list_insert(tmp, authors); + author = string_list_insert(authors, tmp); if (!author->util) author->util = xcalloc(1, sizeof(struct authorstat)); else @@ -186,7 +186,7 @@ static void add_commit(struct string_list *authors, struct commit *commit, date = gmtime(&t); period->trunc(date); tmp = xstrdup(period->pretty(date)); - item = string_list_insert(tmp, items); + item = string_list_insert(items, tmp); if (item->util) free(tmp); item->util++; @@ -279,7 +279,7 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, author = &authors->items[i]; authorstat = author->util; items = &authorstat->list; - date = string_list_lookup(tmp, items); + date = string_list_lookup(items, tmp); if (date) subtotal += (size_t)date->util; } @@ -331,7 +331,7 @@ void print_authors(struct string_list *authors, int top, for (j = 0; j < period->count; j++) { tmp = period->pretty(tm); period->inc(tm); - date = string_list_lookup(tmp, items); + date = string_list_lookup(items, tmp); if (!date) html("0"); else { -- cgit 1.3.0-6-gf8a5