crtxcr/cgitsb
1
0
Fork 0
Código Issues Pull requests Versões Wiki Atividade

Update git to v1.8.2.1

Ver código fonte 
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>
Esse commit está contido em:
John Keeping 2013-04-08 09:00:22 +01:00 commit de Jason A. Donenfeld
commit 849ecd961d
4 arquivos alterados com 7 adições e 6 exclusões
Mostrar estatísticas Baixar arquivo de patch Baixar arquivo de diferenças Expandir todos os arquivos Colapsar todos os arquivos

2
Makefile
Ver arquivo

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> 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 GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
INSTALL = install INSTALL = install
MAN5_TXT = $(wildcard *.5.txt) MAN5_TXT = $(wildcard *.5.txt)

2
git

@ -1 +1 @@
Subproject commit 7e2010537e96d0a1144520222f20ba1dc3d61441 Subproject commit 5bda18c186e455f8e65f976d3bf333ab1f4b5b53

3
ui-commit.c
Ver arquivo

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

6
ui-log.c
Ver arquivo

@ -195,9 +195,8 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
strbuf_addstr(&msgbuf, info->msg); strbuf_addstr(&msgbuf, info->msg);
strbuf_addch(&msgbuf, '\n'); strbuf_addch(&msgbuf, '\n');
} }
format_note(NULL, commit->object.sha1, &msgbuf, format_display_notes(commit->object.sha1,
PAGE_ENCODING, &msgbuf, PAGE_ENCODING, 0);
NOTES_SHOW_HEADER | NOTES_INDENT);
strbuf_addch(&msgbuf, '\n'); strbuf_addch(&msgbuf, '\n');
strbuf_ltrim(&msgbuf); 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; commit->parents = NULL;
} }
init_display_notes(NULL);
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
print_commit(commit, &rev); print_commit(commit, &rev);
free(commit->buffer); free(commit->buffer);