global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-08 09:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fast-import: refactor finalize_commit_buffer()

Browse Source 
In a following commit we are going to finalize commit buffers with or
without signatures in order to check the signatures and possibly drop
them.

To do so easily and without duplication, let's refactor the current
code that finalizes commit buffers into a new finalize_commit_buffer()
function.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2025-11-17 05:34:48 +01:00
committed by Junio C Hamano
parent 4cf919bd7b
commit 388517c14c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/fast-import.c
View File

@@ -2815,6 +2815,18 @@ static void import_one_signature(struct signature_data *sig_sha1,
die(_("parse_one_signature() returned unknown hash algo"));
}
static void finalize_commit_buffer(struct strbuf *new_data,
struct signature_data *sig_sha1,
struct signature_data *sig_sha256,
struct strbuf *msg)
{
add_gpgsig_to_commit(new_data, "gpgsig ", sig_sha1);
add_gpgsig_to_commit(new_data, "gpgsig-sha256 ", sig_sha256);
strbuf_addch(new_data, '\n');
strbuf_addbuf(new_data, msg);
}
static void parse_new_commit(const char *arg)
{
static struct strbuf msg = STRBUF_INIT;
@@ -2950,11 +2962,8 @@ static void parse_new_commit(const char *arg)
"encoding %s\n",
encoding);
add_gpgsig_to_commit(&new_data, "gpgsig ", &sig_sha1);
add_gpgsig_to_commit(&new_data, "gpgsig-sha256 ", &sig_sha256);
finalize_commit_buffer(&new_data, &sig_sha1, &sig_sha256, &msg);
strbuf_addch(&new_data, '\n');
strbuf_addbuf(&new_data, &msg);
free(author);
free(committer);
free(encoding);