summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2023-03-28 15:58:51 +0200
committerJunio C Hamano <gitster@pobox.com>2023-03-28 07:36:45 -0700
commitbab821646a74c446370fa8d01ca851f247df5033 (patch)
tree4b4f9949dc6c0aad1f90ac032d5914ec5c038839 /log-tree.c
parentbc726bd075929aab6b3e09d4dd5c2b0726fd5350 (diff)
downloadgit-bab821646a74c446370fa8d01ca851f247df5033.tar.gz
cocci: apply the "pretty.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to "pretty.h". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/log-tree.c b/log-tree.c
index 1bd4d6ab00..7eee664cd2 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -407,7 +407,8 @@ void fmt_output_commit(struct strbuf *filename,
struct pretty_print_context ctx = {0};
struct strbuf subject = STRBUF_INIT;
- format_commit_message(commit, "%f", &subject, &ctx);
+ repo_format_commit_message(the_repository, commit, "%f", &subject,
+ &ctx);
fmt_output_subject(filename, subject.buf, info);
strbuf_release(&subject);
}
@@ -985,8 +986,10 @@ static int do_remerge_diff(struct rev_info *opt,
o.msg_header_prefix = "remerge";
ctx.abbrev = DEFAULT_ABBREV;
- format_commit_message(parent1, "%h (%s)", &parent1_desc, &ctx);
- format_commit_message(parent2, "%h (%s)", &parent2_desc, &ctx);
+ repo_format_commit_message(the_repository, parent1, "%h (%s)",
+ &parent1_desc, &ctx);
+ repo_format_commit_message(the_repository, parent2, "%h (%s)",
+ &parent2_desc, &ctx);
o.branch1 = parent1_desc.buf;
o.branch2 = parent2_desc.buf;