commit.c 22.6 KB
Newer Older
1
/*
Edward Thomson committed
2
 * Copyright (C) the libgit2 contributors. All rights reserved.
3
 *
Vicent Marti committed
4 5
 * This file is part of libgit2, distributed under the GNU GPL v2 with
 * a Linking Exception. For full terms see the included COPYING file.
6 7
 */

8 9
#include "commit.h"

10 11 12
#include "git2/common.h"
#include "git2/object.h"
#include "git2/repository.h"
13
#include "git2/signature.h"
14
#include "git2/mailmap.h"
15
#include "git2/sys/commit.h"
16

Vicent Marti committed
17
#include "odb.h"
18
#include "commit.h"
19
#include "signature.h"
20
#include "message.h"
21
#include "refs.h"
22
#include "object.h"
23
#include "array.h"
24
#include "oidarray.h"
25

26
void git_commit__free(void *_commit)
27
{
28 29
	git_commit *commit = _commit;

30
	git_array_clear(commit->parent_ids);
31

32 33
	git_signature_free(commit->author);
	git_signature_free(commit->committer);
34

35
	git__free(commit->raw_header);
36
	git__free(commit->raw_message);
37
	git__free(commit->message_encoding);
38
	git__free(commit->summary);
39
	git__free(commit->body);
40

41
	git__free(commit);
42 43
}

44 45
static int git_commit__create_buffer_internal(
	git_buf *out,
46 47 48 49 50
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_oid *tree,
51
	git_array_oid_t *parents)
Vicent Marti committed
52
{
53 54
	size_t i = 0;
	const git_oid *parent;
Vicent Marti committed
55

56
	assert(out && tree);
57

58
	git_oid__writebuf(out, "tree ", tree);
59

60 61 62
	for (i = 0; i < git_array_size(*parents); i++) {
		parent = git_array_get(*parents, i);
		git_oid__writebuf(out, "parent ", parent);
63 64
	}

65 66 67 68 69 70 71
	git_signature__writebuf(out, "author ", author);
	git_signature__writebuf(out, "committer ", committer);

	if (message_encoding != NULL)
		git_buf_printf(out, "encoding %s\n", message_encoding);

	git_buf_putc(out, '\n');
72

73 74 75 76 77 78
	if (git_buf_puts(out, message) < 0)
		goto on_error;

	return 0;

on_error:
79
	git_buf_dispose(out);
80 81
	return -1;
}
82

83
static int validate_tree_and_parents(git_array_oid_t *parents, git_repository *repo, const git_oid *tree,
84 85
	git_commit_parent_callback parent_cb, void *parent_payload,
	const git_oid *current_id, bool validate)
86 87 88 89 90 91
{
	size_t i;
	int error;
	git_oid *parent_cpy;
	const git_oid *parent;

92
	if (validate && !git_object__is_valid(repo, tree, GIT_OBJECT_TREE))
93 94 95
		return -1;

	i = 0;
96
	while ((parent = parent_cb(i, parent_payload)) != NULL) {
97
		if (validate && !git_object__is_valid(repo, parent, GIT_OBJECT_COMMIT)) {
98 99 100 101
			error = -1;
			goto on_error;
		}

102
		parent_cpy = git_array_alloc(*parents);
103
		GIT_ERROR_CHECK_ALLOC(parent_cpy);
104 105

		git_oid_cpy(parent_cpy, parent);
106 107 108
		i++;
	}

109
	if (current_id && (parents->size == 0 || git_oid_cmp(current_id, git_array_get(*parents, 0)))) {
110
		git_error_set(GIT_ERROR_OBJECT, "failed to create commit: current tip is not the first parent");
111 112
		error = GIT_EMODIFIED;
		goto on_error;
113
	}
114

115
	return 0;
116

117 118 119 120
on_error:
	git_array_clear(*parents);
	return error;
}
121

122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140
static int git_commit__create_internal(
	git_oid *id,
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_oid *tree,
	git_commit_parent_callback parent_cb,
	void *parent_payload,
	bool validate)
{
	int error;
	git_odb *odb;
	git_reference *ref = NULL;
	git_buf buf = GIT_BUF_INIT;
	const git_oid *current_id = NULL;
	git_array_oid_t parents = GIT_ARRAY_INIT;
141

142 143 144 145 146
	if (update_ref) {
		error = git_reference_lookup_resolved(&ref, repo, update_ref, 10);
		if (error < 0 && error != GIT_ENOTFOUND)
			return error;
	}
147
	git_error_clear();
148 149 150 151 152 153 154

	if (ref)
		current_id = git_reference_target(ref);

	if ((error = validate_tree_and_parents(&parents, repo, tree, parent_cb, parent_payload, current_id, validate)) < 0)
		goto cleanup;

155
	error = git_commit__create_buffer_internal(&buf, author, committer,
156 157
		message_encoding, message, tree,
		&parents);
158 159 160

	if (error < 0)
		goto cleanup;
161

162
	if (git_repository_odb__weakptr(&odb, repo) < 0)
163
		goto cleanup;
164 165 166

	if (git_odb__freshen(odb, tree) < 0)
		goto cleanup;
167

168
	if (git_odb_write(id, odb, buf.ptr, buf.size, GIT_OBJECT_COMMIT) < 0)
169
		goto cleanup;
Vicent Marti committed
170

171

172
	if (update_ref != NULL) {
173
		error = git_reference__update_for_commit(
174
			repo, ref, update_ref, id, "commit");
175
		goto cleanup;
176
	}
Vicent Marti committed
177

178 179 180
cleanup:
	git_array_clear(parents);
	git_reference_free(ref);
181
	git_buf_dispose(&buf);
182
	return error;
183 184
}

185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201
int git_commit_create_from_callback(
	git_oid *id,
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_oid *tree,
	git_commit_parent_callback parent_cb,
	void *parent_payload)
{
	return git_commit__create_internal(
		id, repo, update_ref, author, committer, message_encoding, message,
		tree, parent_cb, parent_payload, true);
}

202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236
typedef struct {
	size_t total;
	va_list args;
} commit_parent_varargs;

static const git_oid *commit_parent_from_varargs(size_t curr, void *payload)
{
	commit_parent_varargs *data = payload;
	const git_commit *commit;
	if (curr >= data->total)
		return NULL;
	commit = va_arg(data->args, const git_commit *);
	return commit ? git_commit_id(commit) : NULL;
}

int git_commit_create_v(
	git_oid *id,
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_tree *tree,
	size_t parent_count,
	...)
{
	int error = 0;
	commit_parent_varargs data;

	assert(tree && git_tree_owner(tree) == repo);

	data.total = parent_count;
	va_start(data.args, parent_count);

237
	error = git_commit__create_internal(
238 239
		id, repo, update_ref, author, committer,
		message_encoding, message, git_tree_id(tree),
240
		commit_parent_from_varargs, &data, false);
241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270

	va_end(data.args);
	return error;
}

typedef struct {
	size_t total;
	const git_oid **parents;
} commit_parent_oids;

static const git_oid *commit_parent_from_ids(size_t curr, void *payload)
{
	commit_parent_oids *data = payload;
	return (curr < data->total) ? data->parents[curr] : NULL;
}

int git_commit_create_from_ids(
	git_oid *id,
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_oid *tree,
	size_t parent_count,
	const git_oid *parents[])
{
	commit_parent_oids data = { parent_count, parents };

271
	return git_commit__create_internal(
272 273
		id, repo, update_ref, author, committer,
		message_encoding, message, tree,
274
		commit_parent_from_ids, &data, true);
275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
}

typedef struct {
	size_t total;
	const git_commit **parents;
	git_repository *repo;
} commit_parent_data;

static const git_oid *commit_parent_from_array(size_t curr, void *payload)
{
	commit_parent_data *data = payload;
	const git_commit *commit;
	if (curr >= data->total)
		return NULL;
	commit = data->parents[curr];
	if (git_commit_owner(commit) != data->repo)
		return NULL;
	return git_commit_id(commit);
}

295
int git_commit_create(
296
	git_oid *id,
297 298 299 300 301 302 303
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_tree *tree,
304
	size_t parent_count,
305
	const git_commit *parents[])
306
{
307
	commit_parent_data data = { parent_count, parents, repo };
308

309
	assert(tree && git_tree_owner(tree) == repo);
310

311
	return git_commit__create_internal(
312 313
		id, repo, update_ref, author, committer,
		message_encoding, message, git_tree_id(tree),
314
		commit_parent_from_array, &data, false);
315
}
316

317 318 319 320 321 322 323
static const git_oid *commit_parent_for_amend(size_t curr, void *payload)
{
	const git_commit *commit_to_amend = payload;
	if (curr >= git_array_size(commit_to_amend->parent_ids))
		return NULL;
	return git_array_get(commit_to_amend->parent_ids, curr);
}
324

325 326 327 328 329 330 331 332 333 334 335 336
int git_commit_amend(
	git_oid *id,
	const git_commit *commit_to_amend,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_tree *tree)
{
	git_repository *repo;
	git_oid tree_id;
337 338
	git_reference *ref;
	int error;
339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354

	assert(id && commit_to_amend);

	repo = git_commit_owner(commit_to_amend);

	if (!author)
		author = git_commit_author(commit_to_amend);
	if (!committer)
		committer = git_commit_committer(commit_to_amend);
	if (!message_encoding)
		message_encoding = git_commit_message_encoding(commit_to_amend);
	if (!message)
		message = git_commit_message(commit_to_amend);

	if (!tree) {
		git_tree *old_tree;
355
		GIT_ERROR_CHECK_ERROR( git_commit_tree(&old_tree, commit_to_amend) );
356 357 358 359 360 361
		git_oid_cpy(&tree_id, git_tree_id(old_tree));
		git_tree_free(old_tree);
	} else {
		assert(git_tree_owner(tree) == repo);
		git_oid_cpy(&tree_id, git_tree_id(tree));
	}
362

363 364 365 366 367 368
	if (update_ref) {
		if ((error = git_reference_lookup_resolved(&ref, repo, update_ref, 5)) < 0)
			return error;

		if (git_oid_cmp(git_commit_id(commit_to_amend), git_reference_target(ref))) {
			git_reference_free(ref);
369
			git_error_set(GIT_ERROR_REFERENCE, "commit to amend is not the tip of the given branch");
370 371 372 373
			return -1;
		}
	}

374
	error = git_commit__create_internal(
375
		id, repo, NULL, author, committer, message_encoding, message,
376
		&tree_id, commit_parent_for_amend, (void *)commit_to_amend, false);
377 378

	if (!error && update_ref) {
379
		error = git_reference__update_for_commit(
380
			repo, ref, NULL, id, "commit");
381 382 383 384
		git_reference_free(ref);
	}

	return error;
385 386
}

387
static int commit_parse(git_commit *commit, const char *data, size_t size, unsigned int flags)
388
{
389 390
	const char *buffer_start = data, *buffer;
	const char *buffer_end = buffer_start + size;
Vicent Marti committed
391
	git_oid parent_id;
Russell Belfer committed
392
	size_t header_len;
393
	git_signature dummy_sig;
394

395 396
	assert(commit && data);

397
	buffer = buffer_start;
398

399 400
	/* Allocate for one, which will allow not to realloc 90% of the time  */
	git_array_init_to_size(commit->parent_ids, 1);
401
	GIT_ERROR_CHECK_ARRAY(commit->parent_ids);
402

403
	/* The tree is always the first field */
404 405 406 407 408 409 410 411 412
	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
	    if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
			goto bad_buffer;
	} else {
		size_t tree_len = strlen("tree ") + GIT_OID_HEXSZ + 1;
		if (buffer + tree_len > buffer_end)
			goto bad_buffer;
		buffer += tree_len;
	}
413

414 415 416
	/*
	 * TODO: commit grafts!
	 */
417

Vicent Marti committed
418
	while (git_oid__parse(&parent_id, &buffer, buffer_end, "parent ") == 0) {
419
		git_oid *new_id = git_array_alloc(commit->parent_ids);
420
		GIT_ERROR_CHECK_ALLOC(new_id);
421

Vicent Marti committed
422
		git_oid_cpy(new_id, &parent_id);
423
	}
424

425 426 427
	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
		commit->author = git__malloc(sizeof(git_signature));
		GIT_ERROR_CHECK_ALLOC(commit->author);
428

429 430 431
		if (git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n') < 0)
			return -1;
	}
432

433
	/* Some tools create multiple author fields, ignore the extra ones */
434
	while (!git__prefixncmp(buffer, buffer_end - buffer, "author ")) {
435 436 437 438 439 440 441
		if (git_signature__parse(&dummy_sig, &buffer, buffer_end, "author ", '\n') < 0)
			return -1;

		git__free(dummy_sig.name);
		git__free(dummy_sig.email);
	}

442
	/* Always parse the committer; we need the commit time */
443
	commit->committer = git__malloc(sizeof(git_signature));
444
	GIT_ERROR_CHECK_ALLOC(commit->committer);
445 446 447

	if (git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n') < 0)
		return -1;
448

449 450 451
	if (flags & GIT_COMMIT_PARSE_QUICK)
		return 0;

452 453
	/* Parse add'l header entries */
	while (buffer < buffer_end) {
454
		const char *eoln = buffer;
455 456 457
		if (buffer[-1] == '\n' && buffer[0] == '\n')
			break;

458 459
		while (eoln < buffer_end && *eoln != '\n')
			++eoln;
460

461
		if (git__prefixncmp(buffer, buffer_end - buffer, "encoding ") == 0) {
462
			buffer += strlen("encoding ");
463

464
			commit->message_encoding = git__strndup(buffer, eoln - buffer);
465
			GIT_ERROR_CHECK_ALLOC(commit->message_encoding);
466
		}
467

468 469
		if (eoln < buffer_end && *eoln == '\n')
			++eoln;
470
		buffer = eoln;
471
	}
472

473 474
	header_len = buffer - buffer_start;
	commit->raw_header = git__strndup(buffer_start, header_len);
475
	GIT_ERROR_CHECK_ALLOC(commit->raw_header);
476

477 478
	/* point "buffer" to data after header, +1 for the final LF */
	buffer = buffer_start + header_len + 1;
479

480
	/* extract commit message */
481
	if (buffer <= buffer_end)
482
		commit->raw_message = git__strndup(buffer, buffer_end - buffer);
483 484
	else
		commit->raw_message = git__strdup("");
485
	GIT_ERROR_CHECK_ALLOC(commit->raw_message);
486

487 488 489
	return 0;

bad_buffer:
490
	git_error_set(GIT_ERROR_OBJECT, "failed to parse bad commit object");
491
	return -1;
492
}
493

494 495 496 497 498 499 500 501 502 503
int git_commit__parse_raw(void *commit, const char *data, size_t size)
{
	return commit_parse(commit, data, size, 0);
}

int git_commit__parse_ext(git_commit *commit, git_odb_object *odb_obj, unsigned int flags)
{
	return commit_parse(commit, git_odb_object_data(odb_obj), git_odb_object_size(odb_obj), flags);
}

504 505
int git_commit__parse(void *_commit, git_odb_object *odb_obj)
{
506
	return git_commit__parse_ext(_commit, odb_obj, 0);
507 508
}

509
#define GIT_COMMIT_GETTER(_rvalue, _name, _return) \
Vicent Marti committed
510
	_rvalue git_commit_##_name(const git_commit *commit) \
511
	{\
512
		assert(commit); \
513
		return _return; \
514 515
	}

516 517
GIT_COMMIT_GETTER(const git_signature *, author, commit->author)
GIT_COMMIT_GETTER(const git_signature *, committer, commit->committer)
518
GIT_COMMIT_GETTER(const char *, message_raw, commit->raw_message)
519
GIT_COMMIT_GETTER(const char *, message_encoding, commit->message_encoding)
520
GIT_COMMIT_GETTER(const char *, raw_header, commit->raw_header)
521
GIT_COMMIT_GETTER(git_time_t, time, commit->committer->when.time)
522
GIT_COMMIT_GETTER(int, time_offset, commit->committer->when.offset)
523
GIT_COMMIT_GETTER(unsigned int, parentcount, (unsigned int)git_array_size(commit->parent_ids))
524
GIT_COMMIT_GETTER(const git_oid *, tree_id, &commit->tree_id)
525

526 527
const char *git_commit_message(const git_commit *commit)
{
528
	const char *message;
529 530 531

	assert(commit);

532 533
	message = commit->raw_message;

534 535 536 537 538 539 540
	/* trim leading newlines from raw message */
	while (*message && *message == '\n')
		++message;

	return message;
}

541 542 543 544
const char *git_commit_summary(git_commit *commit)
{
	git_buf summary = GIT_BUF_INIT;
	const char *msg, *space;
545
	bool space_contains_newline = false;
546 547 548 549 550

	assert(commit);

	if (!commit->summary) {
		for (msg = git_commit_message(commit), space = NULL; *msg; ++msg) {
551 552 553
			char next_character = msg[0];
			/* stop processing at the end of the first paragraph */
			if (next_character == '\n' && (!msg[1] || msg[1] == '\n'))
554
				break;
555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575
			/* record the beginning of contiguous whitespace runs */
			else if (git__isspace(next_character)) {
				if(space == NULL) {
					space = msg;
					space_contains_newline = false;
				}
				space_contains_newline |= next_character == '\n';
			}
			/* the next character is non-space */
			else {
				/* process any recorded whitespace */
				if (space) {
					if(space_contains_newline)
						git_buf_putc(&summary, ' '); /* if the space contains a newline, collapse to ' ' */
					else
						git_buf_put(&summary, space, (msg - space)); /* otherwise copy it */
					space = NULL;
				}
				/* copy the next character */
				git_buf_putc(&summary, next_character);
			}
576 577
		}

578 579
		commit->summary = git_buf_detach(&summary);
		if (!commit->summary)
580
			commit->summary = git__strdup("");
581 582 583 584 585
	}

	return commit->summary;
}

586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606
const char *git_commit_body(git_commit *commit)
{
	const char *msg, *end;

	assert(commit);

	if (!commit->body) {
		/* search for end of summary */
		for (msg = git_commit_message(commit); *msg; ++msg)
			if (msg[0] == '\n' && (!msg[1] || msg[1] == '\n'))
				break;

		/* trim leading and trailing whitespace */
		for (; *msg; ++msg)
			if (!git__isspace(*msg))
				break;
		for (end = msg + strlen(msg) - 1; msg <= end; --end)
			if (!git__isspace(*end))
				break;

		if (*msg)
607
			commit->body = git__strndup(msg, end - msg + 1);
608 609 610 611 612
	}

	return commit->body;
}

Vicent Marti committed
613
int git_commit_tree(git_tree **tree_out, const git_commit *commit)
614 615
{
	assert(commit);
Vicent Marti committed
616
	return git_tree_lookup(tree_out, commit->object.repo, &commit->tree_id);
617
}
618

619 620
const git_oid *git_commit_parent_id(
	const git_commit *commit, unsigned int n)
621 622 623
{
	assert(commit);

624
	return git_array_get(commit->parent_ids, n);
625 626
}

627 628
int git_commit_parent(
	git_commit **parent, const git_commit *commit, unsigned int n)
629
{
Vicent Marti committed
630
	const git_oid *parent_id;
631 632
	assert(commit);

Vicent Marti committed
633 634
	parent_id = git_commit_parent_id(commit, n);
	if (parent_id == NULL) {
635
		git_error_set(GIT_ERROR_INVALID, "parent %u does not exist", n);
636 637
		return GIT_ENOTFOUND;
	}
638

Vicent Marti committed
639
	return git_commit_lookup(parent, commit->object.repo, parent_id);
640
}
641 642 643 644 645 646

int git_commit_nth_gen_ancestor(
	git_commit **ancestor,
	const git_commit *commit,
	unsigned int n)
{
647
	git_commit *current, *parent = NULL;
648 649 650 651
	int error;

	assert(ancestor && commit);

652
	if (git_commit_dup(&current, (git_commit *)commit) < 0)
653
		return -1;
654

655 656 657 658
	if (n == 0) {
		*ancestor = current;
		return 0;
	}
659 660

	while (n--) {
661
		error = git_commit_parent(&parent, current, 0);
662

663
		git_commit_free(current);
664 665 666 667 668 669 670 671 672 673

		if (error < 0)
			return error;

		current = parent;
	}

	*ancestor = parent;
	return 0;
}
674 675 676

int git_commit_header_field(git_buf *out, const git_commit *commit, const char *field)
{
677
	const char *eol, *buf = commit->raw_header;
678

679
	git_buf_clear(out);
680

681
	while ((eol = strchr(buf, '\n'))) {
682 683 684 685 686 687 688 689 690
		/* We can skip continuations here */
		if (buf[0] == ' ') {
			buf = eol + 1;
			continue;
		}

		/* Skip until we find the field we're after */
		if (git__prefixcmp(buf, field)) {
			buf = eol + 1;
691 692 693
			continue;
		}

694 695 696 697
		buf += strlen(field);
		/* Check that we're not matching a prefix but the field itself */
		if (buf[0] != ' ') {
			buf = eol + 1;
698 699 700
			continue;
		}

701
		buf++; /* skip the SP */
702

703
		git_buf_put(out, buf, eol - buf);
704 705 706 707 708 709
		if (git_buf_oom(out))
			goto oom;

		/* If the next line starts with SP, it's multi-line, we must continue */
		while (eol[1] == ' ') {
			git_buf_putc(out, '\n');
710 711
			buf = eol + 2;
			eol = strchr(buf, '\n');
712 713 714
			if (!eol)
				goto malformed;

715
			git_buf_put(out, buf, eol - buf);
716 717 718 719 720 721 722 723
		}

		if (git_buf_oom(out))
			goto oom;

		return 0;
	}

724
	git_error_set(GIT_ERROR_OBJECT, "no such field '%s'", field);
725 726 727
	return GIT_ENOTFOUND;

malformed:
728
	git_error_set(GIT_ERROR_OBJECT, "malformed header");
729 730
	return -1;
oom:
731
	git_error_set_oom();
732 733
	return -1;
}
734 735 736 737 738 739 740 741 742

int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_repository *repo, git_oid *commit_id, const char *field)
{
	git_odb_object *obj;
	git_odb *odb;
	const char *buf;
	const char *h, *eol;
	int error;

743 744
	git_buf_clear(signature);
	git_buf_clear(signed_data);
745 746 747 748 749 750 751 752 753 754

	if (!field)
		field = "gpgsig";

	if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
		return error;

	if ((error = git_odb_read(&obj, odb, commit_id)) < 0)
		return error;

755
	if (obj->cached.type != GIT_OBJECT_COMMIT) {
756
		git_error_set(GIT_ERROR_INVALID, "the requested type does not match the type in the ODB");
757 758 759 760
		error = GIT_ENOTFOUND;
		goto cleanup;
	}

761 762
	buf = git_odb_object_data(obj);

763
	while ((h = strchr(buf, '\n')) && h[1] != '\0') {
764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802
		h++;
		if (git__prefixcmp(buf, field)) {
			if (git_buf_put(signed_data, buf, h - buf) < 0)
				return -1;

			buf = h;
			continue;
		}

		h = buf;
		h += strlen(field);
		eol = strchr(h, '\n');
		if (h[0] != ' ') {
			buf = h;
			continue;
		}
		if (!eol)
			goto malformed;

		h++; /* skip the SP */

		git_buf_put(signature, h, eol - h);
		if (git_buf_oom(signature))
			goto oom;

		/* If the next line starts with SP, it's multi-line, we must continue */
		while (eol[1] == ' ') {
			git_buf_putc(signature, '\n');
			h = eol + 2;
			eol = strchr(h, '\n');
			if (!eol)
				goto malformed;

			git_buf_put(signature, h, eol - h);
		}

		if (git_buf_oom(signature))
			goto oom;

803
		error = git_buf_puts(signed_data, eol+1);
804
		git_odb_object_free(obj);
805
		return error;
806 807
	}

808
	git_error_set(GIT_ERROR_OBJECT, "this commit is not signed");
809 810 811 812
	error = GIT_ENOTFOUND;
	goto cleanup;

malformed:
813
	git_error_set(GIT_ERROR_OBJECT, "malformed header");
814 815 816
	error = -1;
	goto cleanup;
oom:
817
	git_error_set_oom();
818 819 820 821 822 823 824 825 826
	error = -1;
	goto cleanup;

cleanup:
	git_odb_object_free(obj);
	git_buf_clear(signature);
	git_buf_clear(signed_data);
	return error;
}
827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850

int git_commit_create_buffer(git_buf *out,
	git_repository *repo,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_tree *tree,
	size_t parent_count,
	const git_commit *parents[])
{
	int error;
	commit_parent_data data = { parent_count, parents, repo };
	git_array_oid_t parents_arr = GIT_ARRAY_INIT;
	const git_oid *tree_id;

	assert(tree && git_tree_owner(tree) == repo);

	tree_id = git_tree_id(tree);

	if ((error = validate_tree_and_parents(&parents_arr, repo, tree_id, commit_parent_from_array, &data, NULL, true)) < 0)
		return error;

	error = git_commit__create_buffer_internal(
851
		out, author, committer,
852 853 854 855 856 857
		message_encoding, message, tree_id,
		&parents_arr);

	git_array_clear(parents_arr);
	return error;
}
858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880

/**
 * Append to 'out' properly marking continuations when there's a newline in 'content'
 */
static void format_header_field(git_buf *out, const char *field, const char *content)
{
	const char *lf;

	assert(out && field && content);

	git_buf_puts(out, field);
	git_buf_putc(out, ' ');

	while ((lf = strchr(content, '\n')) != NULL) {
		git_buf_put(out, content, lf - content);
		git_buf_puts(out, "\n ");
		content = lf + 1;
	}

	git_buf_puts(out, content);
	git_buf_putc(out, '\n');
}

881 882 883 884 885 886 887 888
static const git_oid *commit_parent_from_commit(size_t n, void *payload)
{
	const git_commit *commit = (const git_commit *) payload;

	return git_array_get(commit->parent_ids, n);

}

889 890 891 892 893 894 895 896 897 898 899 900
int git_commit_create_with_signature(
	git_oid *out,
	git_repository *repo,
	const char *commit_content,
	const char *signature,
	const char *signature_field)
{
	git_odb *odb;
	int error = 0;
	const char *field;
	const char *header_end;
	git_buf commit = GIT_BUF_INIT;
901 902
	git_commit *parsed;
	git_array_oid_t parents = GIT_ARRAY_INIT;
903

904 905 906 907 908 909 910 911 912 913 914 915
	/* The first step is to verify that all the tree and parents exist */
	parsed = git__calloc(1, sizeof(git_commit));
	GIT_ERROR_CHECK_ALLOC(parsed);
	if ((error = commit_parse(parsed, commit_content, strlen(commit_content), 0)) < 0)
		goto cleanup;

	if ((error = validate_tree_and_parents(&parents, repo, &parsed->tree_id, commit_parent_from_commit, parsed, NULL, true)) < 0)
		goto cleanup;

	git_array_clear(parents);

	/* Then we start appending by identifying the end of the commit header */
916 917
	header_end = strstr(commit_content, "\n\n");
	if (!header_end) {
918
		git_error_set(GIT_ERROR_INVALID, "malformed commit contents");
919 920
		error = -1;
		goto cleanup;
921 922 923 924 925
	}

	/* The header ends after the first LF */
	header_end++;
	git_buf_put(&commit, commit_content, header_end - commit_content);
926 927 928 929 930 931

	if (signature != NULL) {
		field = signature_field ? signature_field : "gpgsig";
		format_header_field(&commit, field, signature);
	}

932 933 934 935 936 937 938 939
	git_buf_puts(&commit, header_end);

	if (git_buf_oom(&commit))
		return -1;

	if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
		goto cleanup;

940
	if ((error = git_odb_write(out, odb, commit.ptr, commit.size, GIT_OBJECT_COMMIT)) < 0)
941 942 943
		goto cleanup;

cleanup:
944
	git_commit__free(parsed);
945
	git_buf_dispose(&commit);
946 947
	return error;
}
948 949 950 951

int git_commit_committer_with_mailmap(
	git_signature **out, const git_commit *commit, const git_mailmap *mailmap)
{
952
	return git_mailmap_resolve_signature(out, mailmap, commit->committer);
953 954 955 956 957
}

int git_commit_author_with_mailmap(
	git_signature **out, const git_commit *commit, const git_mailmap *mailmap)
{
958
	return git_mailmap_resolve_signature(out, mailmap, commit->author);
959
}