mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use GIT-1.7.2.2

Browse Source 
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2010-08-22 13:29:57 +02:00
parent 379e80e3a8
commit 6d7552bc07
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
CGIT_CONFIG = /etc/cgitrc CGIT_CONFIG = /etc/cgitrc
CACHE_ROOT = /var/cache/cgit CACHE_ROOT = /var/cache/cgit
SHA1_HEADER = <openssl/sha.h> 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 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
INSTALL = install INSTALL = install
@ -71,7 +71,7 @@ endif
$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< $(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 =
OBJECTS += cache.o OBJECTS += cache.o
OBJECTS += cgit.o OBJECTS += cgit.o

2
cgit.c
View File

@ -22,7 +22,7 @@ void add_mimetype(const char *name, const char *value)
{ {
struct string_list_item *item; 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); item->util = xstrdup(value);
} }

2
git

@ -1 +1 @@
Subproject commit e923eaeb901ff056421b9007adcbbce271caa7b6 Subproject commit 8c67c392e1620fc3b749aa9e0b8da13bd84226f8

2
ui-commit.c
View File

@ -36,7 +36,7 @@ void cgit_print_commit(char *hex, const char *prefix)
} }
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
get_commit_notes(commit, &notes, PAGE_ENCODING, 0); format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
load_ref_decorations(DECORATE_FULL_REFS); load_ref_decorations(DECORATE_FULL_REFS);

2
ui-log.c
View File

@ -112,7 +112,7 @@ void print_commit(struct commit *commit)
html("</td></tr>\n"); html("</td></tr>\n");
if (ctx.qry.showmsg) { if (ctx.qry.showmsg) {
struct strbuf notes = STRBUF_INIT; struct strbuf notes = STRBUF_INIT;
get_commit_notes(commit, &notes, PAGE_ENCODING, 0); format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
if (ctx.repo->enable_log_filecount) { if (ctx.repo->enable_log_filecount) {
cols++; cols++;

2
ui-plain.c
View File

@ -34,7 +34,7 @@ static void print_object(const unsigned char *sha1, const char *path)
ctx.page.mimetype = NULL; ctx.page.mimetype = NULL;
ext = strrchr(path, '.'); ext = strrchr(path, '.');
if (ext && *(++ext)) { if (ext && *(++ext)) {
mime = string_list_lookup(ext, &ctx.cfg.mimetypes); mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
if (mime) if (mime)
ctx.page.mimetype = (char *)mime->util; ctx.page.mimetype = (char *)mime->util;
} }

8
ui-stats.c
View File

@ -175,7 +175,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
tmp = xstrdup(info->author); tmp = xstrdup(info->author);
author = string_list_insert(tmp, authors); author = string_list_insert(authors, tmp);
if (!author->util) if (!author->util)
author->util = xcalloc(1, sizeof(struct authorstat)); author->util = xcalloc(1, sizeof(struct authorstat));
else else
@ -186,7 +186,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
date = gmtime(&t); date = gmtime(&t);
period->trunc(date); period->trunc(date);
tmp = xstrdup(period->pretty(date)); tmp = xstrdup(period->pretty(date));
item = string_list_insert(tmp, items); item = string_list_insert(items, tmp);
if (item->util) if (item->util)
free(tmp); free(tmp);
item->util++; item->util++;
@ -279,7 +279,7 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
author = &authors->items[i]; author = &authors->items[i];
authorstat = author->util; authorstat = author->util;
items = &authorstat->list; items = &authorstat->list;
date = string_list_lookup(tmp, items); date = string_list_lookup(items, tmp);
if (date) if (date)
subtotal += (size_t)date->util; 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++) { for (j = 0; j < period->count; j++) {
tmp = period->pretty(tm); tmp = period->pretty(tm);
period->inc(tm); period->inc(tm);
date = string_list_lookup(tmp, items); date = string_list_lookup(items, tmp);
if (!date) if (!date)
html("<td>0</td>"); html("<td>0</td>");
else { else {