diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-03-28 15:58:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 07:36:45 -0700 |
| commit | bab821646a74c446370fa8d01ca851f247df5033 (patch) | |
| tree | 4b4f9949dc6c0aad1f90ac032d5914ec5c038839 /builtin/notes.c | |
| parent | bc726bd075929aab6b3e09d4dd5c2b0726fd5350 (diff) | |
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 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index ba1daa4ff0..f4939176da 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -742,7 +742,8 @@ static int merge_commit(struct notes_merge_options *o) /* Reuse existing commit message in reflog message */ memset(&pretty_ctx, 0, sizeof(pretty_ctx)); - format_commit_message(partial, "%s", &msg, &pretty_ctx); + repo_format_commit_message(the_repository, partial, "%s", &msg, + &pretty_ctx); strbuf_trim(&msg); strbuf_insertstr(&msg, 0, "notes: "); update_ref(msg.buf, o->local_ref, &oid, |