summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-22 23:32:19 -0700
committerJunio C Hamano <gitster@pobox.com>2007-06-22 23:32:19 -0700
commit9bee7aabcd74bf112fcdaf255551147feca8f66c (patch)
tree7e880ce1ba6dc9e59a30fdc1cbdc0f3e8b0992e3 /builtin-log.c
parent55f22ff22e5ff6c21b50cf379ee946f9642fc3cb (diff)
parent25fd2f7a310df17dca298a3acf2aba716ceb8ce3 (diff)
downloadgit-9bee7aabcd74bf112fcdaf255551147feca8f66c.tar.gz
Merge branch 'ei/oneline+add-empty'
* ei/oneline+add-empty: Fix ALLOC_GROW calls with obsolete semantics Fix ALLOC_GROW off-by-one builtin-add: simplify (and increase accuracy of) exclude handling dir_struct: add collect_ignored option Extend --pretty=oneline to cover the first paragraph, Lift 16kB limit of log message output
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 0aede76839..b9035ab799 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -742,11 +742,13 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
sign = '-';
if (verbose) {
- static char buf[16384];
+ char *buf = NULL;
+ unsigned long buflen = 0;
pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
- buf, sizeof(buf), 0, NULL, NULL, 0);
+ &buf, &buflen, 0, NULL, NULL, 0);
printf("%c %s %s\n", sign,
sha1_to_hex(commit->object.sha1), buf);
+ free(buf);
}
else {
printf("%c %s\n", sign,