Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
commit: record buffer length in cache
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 78908aaacc6676913b369e80c54d9e11444395bd..a9ab328923db3f2b2c945c479386316333dfcd0a 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-190,7
+190,7
@@
static void output_commit_title(struct merge_options *o, struct commit *commit)
printf(_("(bad commit)\n"));
else {
const char *title;
- const char *msg = get_commit_buffer(commit);
+ const char *msg = get_commit_buffer(commit
, NULL
);
int len = find_commit_subject(msg, &title);
if (len)
printf("%.*s\n", len, title);