Author: John Keeping <john@keeping.me.uk>
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>
Makefile | 2 +- parsing.c | 3 ++- ui-atom.c | 3 +-- ui-log.c | 6 ++---- ui-stats.c | 2 +-
diff --git a/Makefile b/Makefile index bf8be025d4adb18c2a315e6f676d1faf2f8afb04..93b525a72e446c36f4bc6d095e1ae8b598a75e96 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.0.1 +GIT_VER = 2.0.3 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz INSTALL = install COPYTREE = cp -r diff --git a/parsing.c b/parsing.c index edb341694706a0cbe4ffd4f765e5cb1890a0159a..3dbd12293186baad1a5cb07c67890b8b033d4083 100644 --- a/parsing.c +++ b/parsing.c @@ -132,7 +132,8 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) { struct commitinfo *ret; - const char *p = commit->buffer, *t; + const char *p = get_cached_commit_buffer(commit, NULL); + const char *t; ret = xmalloc(sizeof(*ret)); ret->commit = commit; diff --git a/ui-atom.c b/ui-atom.c index b22d745a92c5b8e4fe414337b48a7139bbce2f18..e2b39ee1d1c51cb109e69dc65b26feefe866d76d 100644 --- a/ui-atom.c +++ b/ui-atom.c @@ -133,8 +133,7 @@ html("'/>\n"); } while ((commit = get_revision(&rev)) != NULL) { add_entry(commit, host); - free(commit->buffer); - commit->buffer = NULL; + free_commit_buffer(commit); free_commit_list(commit->parents); commit->parents = NULL; } diff --git a/ui-log.c b/ui-log.c index b5846e41c42c4829a601d66e5f072c58a7a9537a..bcdb6662f4c25b75cb84fd84aece92f371d63f7d 100644 --- a/ui-log.c +++ b/ui-log.c @@ -388,16 +388,14 @@ if (ofs<0) ofs = 0; for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { - free(commit->buffer); - commit->buffer = NULL; + free_commit_buffer(commit); free_commit_list(commit->parents); commit->parents = NULL; } for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { print_commit(commit, &rev); - free(commit->buffer); - commit->buffer = NULL; + free_commit_buffer(commit); free_commit_list(commit->parents); commit->parents = NULL; } diff --git a/ui-stats.c b/ui-stats.c index bc273088a4ee2a34daf9da2a33b5578c2255740a..6f13c32e36efe2beca2e730191f738aad7bd7f11 100644 --- a/ui-stats.c +++ b/ui-stats.c @@ -244,7 +244,7 @@ prepare_revision_walk(&rev); memset(&authors, 0, sizeof(authors)); while ((commit = get_revision(&rev)) != NULL) { add_commit(&authors, commit, period); - free(commit->buffer); + free_commit_buffer(commit); free_commit_list(commit->parents); } return authors;