-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
@@ -7,3 +7,3 @@ CACHE_ROOT = /var/cache/cgit | |||
7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.7.0 | 8 | GIT_VER = 1.7.2.2 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
@@ -73,3 +73,3 @@ endif | |||
73 | 73 | ||
74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz | 74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
75 | OBJECTS = | 75 | OBJECTS = |
@@ -24,3 +24,3 @@ void add_mimetype(const char *name, const char *value) | |||
24 | 24 | ||
25 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); | 25 | item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); |
26 | item->util = xstrdup(value); | 26 | 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 | |||
@@ -38,3 +38,3 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
38 | 38 | ||
39 | get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); | 39 | format_note(NULL, sha1, ¬es, PAGE_ENCODING, 0); |
40 | 40 | ||
@@ -114,3 +114,3 @@ void print_commit(struct commit *commit) | |||
114 | struct strbuf notes = STRBUF_INIT; | 114 | struct strbuf notes = STRBUF_INIT; |
115 | get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); | 115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
116 | 116 | ||
@@ -36,3 +36,3 @@ static void print_object(const unsigned char *sha1, const char *path) | |||
36 | if (ext && *(++ext)) { | 36 | if (ext && *(++ext)) { |
37 | mime = string_list_lookup(ext, &ctx.cfg.mimetypes); | 37 | mime = string_list_lookup(&ctx.cfg.mimetypes, ext); |
38 | if (mime) | 38 | if (mime) |
@@ -177,3 +177,3 @@ static void add_commit(struct string_list *authors, struct commit *commit, | |||
177 | tmp = xstrdup(info->author); | 177 | tmp = xstrdup(info->author); |
178 | author = string_list_insert(tmp, authors); | 178 | author = string_list_insert(authors, tmp); |
179 | if (!author->util) | 179 | if (!author->util) |
@@ -188,3 +188,3 @@ static void add_commit(struct string_list *authors, struct commit *commit, | |||
188 | tmp = xstrdup(period->pretty(date)); | 188 | tmp = xstrdup(period->pretty(date)); |
189 | item = string_list_insert(tmp, items); | 189 | item = string_list_insert(items, tmp); |
190 | if (item->util) | 190 | if (item->util) |
@@ -281,3 +281,3 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, | |||
281 | items = &authorstat->list; | 281 | items = &authorstat->list; |
282 | date = string_list_lookup(tmp, items); | 282 | date = string_list_lookup(items, tmp); |
283 | if (date) | 283 | if (date) |
@@ -333,3 +333,3 @@ void print_authors(struct string_list *authors, int top, | |||
333 | period->inc(tm); | 333 | period->inc(tm); |
334 | date = string_list_lookup(tmp, items); | 334 | date = string_list_lookup(items, tmp); |
335 | if (!date) | 335 | if (!date) |