Update git to v1.8.2.1
This requires a small change to how we handle notes, but otherwise just works. Note that we can't use anything from v1.8.0 until v1.8.2.1 because some of the symbols that we need for graph drawing were made private in v1.8.0 and this was not reverted until v1.8.2.1. Signed-off-by: John Keeping <john@keeping.me.uk>
这个提交包含在:
2
Makefile
2
Makefile
@ -14,7 +14,7 @@ htmldir = $(docdir)
|
||||
pdfdir = $(docdir)
|
||||
mandir = $(prefix)/share/man
|
||||
SHA1_HEADER = <openssl/sha.h>
|
||||
GIT_VER = 1.7.12.4
|
||||
GIT_VER = 1.8.2.1
|
||||
GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
|
||||
INSTALL = install
|
||||
MAN5_TXT = $(wildcard *.5.txt)
|
||||
|
2
git
2
git
子模块 git 已更新:7e2010537e...5bda18c186
@ -36,7 +36,8 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||
}
|
||||
info = cgit_parse_commit(commit);
|
||||
|
||||
format_note(NULL, sha1, ¬es, PAGE_ENCODING, 0);
|
||||
init_display_notes(NULL);
|
||||
format_display_notes(sha1, ¬es, PAGE_ENCODING, 0);
|
||||
|
||||
load_ref_decorations(DECORATE_FULL_REFS);
|
||||
|
||||
|
6
ui-log.c
6
ui-log.c
@ -195,9 +195,8 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
|
||||
strbuf_addstr(&msgbuf, info->msg);
|
||||
strbuf_addch(&msgbuf, '\n');
|
||||
}
|
||||
format_note(NULL, commit->object.sha1, &msgbuf,
|
||||
PAGE_ENCODING,
|
||||
NOTES_SHOW_HEADER | NOTES_INDENT);
|
||||
format_display_notes(commit->object.sha1,
|
||||
&msgbuf, PAGE_ENCODING, 0);
|
||||
strbuf_addch(&msgbuf, '\n');
|
||||
strbuf_ltrim(&msgbuf);
|
||||
}
|
||||
@ -397,6 +396,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||
commit->parents = NULL;
|
||||
}
|
||||
|
||||
init_display_notes(NULL);
|
||||
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
|
||||
print_commit(commit, &rev);
|
||||
free(commit->buffer);
|
||||
|
在新工单中引用
屏蔽一个用户