about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJohn Keeping2014-07-27 11:56:19 +0100
committerJason A. Donenfeld2014-07-28 02:01:35 +0200
commit865afe0eb1b5e6485fe0f65472e6635266e393b1 (patch)
tree37cd135486f1d669c91491e39e37326787be34d1
parentparsing.c: make commit buffer const (diff)
downloadcgit-865afe0eb1b5e6485fe0f65472e6635266e393b1.tar.gz
cgit-865afe0eb1b5e6485fe0f65472e6635266e393b1.zip
git: update to v2.0.3
This is slightly more involved than just bumping the version number
because it pulls in a change to convert the commit buffer to a slab,
removing the "buffer" field from "struct commit".  All sites that access
"commit->buffer" have been changed to use the new functions provided for
this purpose.

Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--parsing.c3
-rw-r--r--ui-atom.c3
-rw-r--r--ui-log.c6
-rw-r--r--ui-stats.c2
6 files changed, 7 insertions, 9 deletions
diff --git a/Makefile b/Makefile index bf8be02..93b525a 100644 --- a/Makefile +++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
14pdfdir = $(docdir) 14pdfdir = $(docdir)
15mandir = $(prefix)/share/man 15mandir = $(prefix)/share/man
16SHA1_HEADER = <openssl/sha.h> 16SHA1_HEADER = <openssl/sha.h>
17GIT_VER = 2.0.1 17GIT_VER = 2.0.3
18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz 18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
19INSTALL = install 19INSTALL = install
20COPYTREE = cp -r 20COPYTREE = cp -r
diff --git a/git b/git
Subproject 341e7e8eda3dbeb6867f4f8f45b671201b807de Subproject 740c281d21ef5b27f6f1b942a4f2fc20f51e8c7
diff --git a/parsing.c b/parsing.c index edb3416..3dbd122 100644 --- a/parsing.c +++ b/parsing.c
@@ -132,7 +132,8 @@ static const char *reencode(char **txt, const char *src_enc, const char *dst_enc
132struct commitinfo *cgit_parse_commit(struct commit *commit) 132struct commitinfo *cgit_parse_commit(struct commit *commit)
133{ 133{
134 struct commitinfo *ret; 134 struct commitinfo *ret;
135 const char *p = commit->buffer, *t; 135 const char *p = get_cached_commit_buffer(commit, NULL);
136 const char *t;
136 137
137 ret = xmalloc(sizeof(*ret)); 138 ret = xmalloc(sizeof(*ret));
138 ret->commit = commit; 139 ret->commit = commit;
diff --git a/ui-atom.c b/ui-atom.c index b22d745..e2b39ee 100644 --- a/ui-atom.c +++ b/ui-atom.c
@@ -133,8 +133,7 @@ void cgit_print_atom(char *tip, char *path, int max_count)
133 } 133 }
134 while ((commit = get_revision(&rev)) != NULL) { 134 while ((commit = get_revision(&rev)) != NULL) {
135 add_entry(commit, host); 135 add_entry(commit, host);
136 free(commit->buffer); 136 free_commit_buffer(commit);
137 commit->buffer = NULL;
138 free_commit_list(commit->parents); 137 free_commit_list(commit->parents);
139 commit->parents = NULL; 138 commit->parents = NULL;
140 } 139 }
diff --git a/ui-log.c b/ui-log.c index b5846e4..bcdb666 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -388,16 +388,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
388 ofs = 0; 388 ofs = 0;
389 389
390 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 390 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
391 free(commit->buffer); 391 free_commit_buffer(commit);
392 commit->buffer = NULL;
393 free_commit_list(commit->parents); 392 free_commit_list(commit->parents);
394 commit->parents = NULL; 393 commit->parents = NULL;
395 } 394 }
396 395
397 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 396 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
398 print_commit(commit, &rev); 397 print_commit(commit, &rev);
399 free(commit->buffer); 398 free_commit_buffer(commit);
400 commit->buffer = NULL;
401 free_commit_list(commit->parents); 399 free_commit_list(commit->parents);
402 commit->parents = NULL; 400 commit->parents = NULL;
403 } 401 }
diff --git a/ui-stats.c b/ui-stats.c index bc27308..6f13c32 100644 --- a/ui-stats.c +++ b/ui-stats.c
@@ -244,7 +244,7 @@ static struct string_list collect_stats(struct cgit_period *period)
244 memset(&authors, 0, sizeof(authors)); 244 memset(&authors, 0, sizeof(authors));
245 while ((commit = get_revision(&rev)) != NULL) { 245 while ((commit = get_revision(&rev)) != NULL) {
246 add_commit(&authors, commit, period); 246 add_commit(&authors, commit, period);
247 free(commit->buffer); 247 free_commit_buffer(commit);
248 free_commit_list(commit->parents); 248 free_commit_list(commit->parents);
249 } 249 }
250 return authors; 250 return authors;