diff options
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | parsing.c | 3 | ||||
| -rw-r--r-- | ui-atom.c | 3 | ||||
| -rw-r--r-- | ui-log.c | 6 | ||||
| -rw-r--r-- | ui-stats.c | 2 |
6 files changed, 7 insertions, 9 deletions
| @@ -14,7 +14,7 @@ htmldir = $(docdir) | |||
| 14 | pdfdir = $(docdir) | 14 | pdfdir = $(docdir) |
| 15 | mandir = $(prefix)/share/man | 15 | mandir = $(prefix)/share/man |
| 16 | SHA1_HEADER = <openssl/sha.h> | 16 | SHA1_HEADER = <openssl/sha.h> |
| 17 | GIT_VER = 2.0.1 | 17 | GIT_VER = 2.0.3 |
| 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz | 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz |
| 19 | INSTALL = install | 19 | INSTALL = install |
| 20 | COPYTREE = cp -r | 20 | COPYTREE = cp -r |
diff --git a/git b/git | |||
| Subproject 341e7e8eda3dbeb6867f4f8f45b671201b807de | Subproject 740c281d21ef5b27f6f1b942a4f2fc20f51e8c7 | ||
| @@ -132,7 +132,8 @@ static const char *reencode(char **txt, const char *src_enc, const char *dst_enc | |||
| 132 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 132 | struct 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; |
| @@ -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 | } |
| @@ -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 | } |
| @@ -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; |
