author | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 11:29:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 11:29:57 (UTC) |
commit | 6d7552bc072599313ef423d69156d824c075572a (patch) (side-by-side diff) | |
tree | 3189efeb6ca80dc6dcf0811ff2d8011e2b3e8c7b | |
parent | 379e80e3a83481d3639c5d312eeddcce57c486b2 (diff) | |
download | cgit-6d7552bc072599313ef423d69156d824c075572a.zip cgit-6d7552bc072599313ef423d69156d824c075572a.tar.gz cgit-6d7552bc072599313ef423d69156d824c075572a.tar.bz2 |
Use GIT-1.7.2.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | cgit.c | 2 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | ui-commit.c | 2 | ||||
-rw-r--r-- | ui-log.c | 2 | ||||
-rw-r--r-- | ui-plain.c | 2 | ||||
-rw-r--r-- | ui-stats.c | 8 |
7 files changed, 10 insertions, 10 deletions
@@ -6,5 +6,5 @@ CGIT_CONFIG = /etc/cgitrc CACHE_ROOT = /var/cache/cgit SHA1_HEADER = <openssl/sha.h> -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 @@ -72,5 +72,5 @@ endif -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread OBJECTS = OBJECTS += cache.o @@ -23,5 +23,5 @@ 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 -Subproject e923eaeb901ff056421b9007adcbbce271caa7b +Subproject 8c67c392e1620fc3b749aa9e0b8da13bd84226f diff --git a/ui-commit.c b/ui-commit.c index 45af450..2b4f677 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -37,5 +37,5 @@ 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); @@ -113,5 +113,5 @@ void print_commit(struct commit *commit) 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) { @@ -35,5 +35,5 @@ static void print_object(const unsigned char *sha1, const char *path) 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; @@ -176,5 +176,5 @@ 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)); @@ -187,5 +187,5 @@ static void add_commit(struct string_list *authors, struct commit *commit, 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); @@ -280,5 +280,5 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, 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; @@ -332,5 +332,5 @@ void print_authors(struct string_list *authors, int top, tmp = period->pretty(tm); period->inc(tm); - date = string_list_lookup(tmp, items); + date = string_list_lookup(items, tmp); if (!date) html("<td>0</td>"); |