Skip to content

Commit 25f87d7

Browse files
chriscoolgitster
authored andcommitted
fast-import: refactor finalize_commit_buffer()
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>
1 parent 4cf919b commit 25f87d7

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

builtin/fast-import.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2815,6 +2815,18 @@ static void import_one_signature(struct signature_data *sig_sha1,
28152815
die(_("parse_one_signature() returned unknown hash algo"));
28162816
}
28172817

2818+
static void finalize_commit_buffer(struct strbuf *new_data,
2819+
struct signature_data *sig_sha1,
2820+
struct signature_data *sig_sha256,
2821+
struct strbuf *msg)
2822+
{
2823+
add_gpgsig_to_commit(new_data, "gpgsig ", sig_sha1);
2824+
add_gpgsig_to_commit(new_data, "gpgsig-sha256 ", sig_sha256);
2825+
2826+
strbuf_addch(new_data, '\n');
2827+
strbuf_addbuf(new_data, msg);
2828+
}
2829+
28182830
static void parse_new_commit(const char *arg)
28192831
{
28202832
static struct strbuf msg = STRBUF_INIT;
@@ -2950,11 +2962,8 @@ static void parse_new_commit(const char *arg)
29502962
"encoding %s\n",
29512963
encoding);
29522964

2953-
add_gpgsig_to_commit(&new_data, "gpgsig ", &sig_sha1);
2954-
add_gpgsig_to_commit(&new_data, "gpgsig-sha256 ", &sig_sha256);
2965+
finalize_commit_buffer(&new_data, &sig_sha1, &sig_sha256, &msg);
29552966

2956-
strbuf_addch(&new_data, '\n');
2957-
strbuf_addbuf(&new_data, &msg);
29582967
free(author);
29592968
free(committer);
29602969
free(encoding);

0 commit comments

Comments
 (0)