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

#include "common.h"
9

10 11 12 13 14 15
#include "buffer.h"
#include "repository.h"
#include "posix.h"
#include "filebuf.h"
#include "merge.h"
#include "array.h"
16
#include "config.h"
17
#include "annotated_commit.h"
18
#include "index.h"
19 20

#include <git2/types.h>
21
#include <git2/annotated_commit.h>
22 23 24 25
#include <git2/rebase.h>
#include <git2/commit.h>
#include <git2/reset.h>
#include <git2/revwalk.h>
26
#include <git2/notes.h>
27

28 29
#define REBASE_APPLY_DIR    "rebase-apply"
#define REBASE_MERGE_DIR    "rebase-merge"
30

31 32 33 34 35 36
#define HEAD_NAME_FILE      "head-name"
#define ORIG_HEAD_FILE      "orig-head"
#define HEAD_FILE           "head"
#define ONTO_FILE           "onto"
#define ONTO_NAME_FILE      "onto_name"
#define QUIET_FILE          "quiet"
37

38 39 40 41 42
#define MSGNUM_FILE         "msgnum"
#define END_FILE            "end"
#define CMT_FILE_FMT        "cmt.%" PRIuZ
#define CURRENT_FILE        "current"
#define REWRITTEN_FILE      "rewritten"
43

44
#define ORIG_DETACHED_HEAD  "detached HEAD"
45

46
#define NOTES_DEFAULT_REF   NULL
47

48 49
#define REBASE_DIR_MODE     0777
#define REBASE_FILE_MODE    0666
50 51 52 53 54

typedef enum {
	GIT_REBASE_TYPE_NONE = 0,
	GIT_REBASE_TYPE_APPLY = 1,
	GIT_REBASE_TYPE_MERGE = 2,
55
	GIT_REBASE_TYPE_INTERACTIVE = 3,
56 57
} git_rebase_type_t;

58 59 60
struct git_rebase {
	git_repository *repo;

61 62
	git_rebase_options options;

63 64 65
	git_rebase_type_t type;
	char *state_path;

66
	int head_detached : 1,
67
		inmemory : 1,
68 69
		quiet : 1,
		started : 1;
70

71 72 73 74
	git_array_t(git_rebase_operation) operations;
	size_t current;

	/* Used by in-memory rebase */
75
	git_index *index;
76 77 78
	git_commit *last_commit;

	/* Used by regular (not in-memory) merge-style rebase */
79
	git_oid orig_head_id;
80
	char *orig_head_name;
81

82
	git_oid onto_id;
83
	char *onto_name;
84
};
85 86 87

#define GIT_REBASE_STATE_INIT {0}

88 89 90 91 92 93 94 95
static int rebase_state_type(
	git_rebase_type_t *type_out,
	char **path_out,
	git_repository *repo)
{
	git_buf path = GIT_BUF_INIT;
	git_rebase_type_t type = GIT_REBASE_TYPE_NONE;

96
	if (git_buf_joinpath(&path, repo->gitdir, REBASE_APPLY_DIR) < 0)
97 98 99 100 101 102 103 104
		return -1;

	if (git_path_isdir(git_buf_cstr(&path))) {
		type = GIT_REBASE_TYPE_APPLY;
		goto done;
	}

	git_buf_clear(&path);
105
	if (git_buf_joinpath(&path, repo->gitdir, REBASE_MERGE_DIR) < 0)
106 107 108 109 110 111 112 113 114 115 116 117 118
		return -1;

	if (git_path_isdir(git_buf_cstr(&path))) {
		type = GIT_REBASE_TYPE_MERGE;
		goto done;
	}

done:
	*type_out = type;

	if (type != GIT_REBASE_TYPE_NONE && path_out)
		*path_out = git_buf_detach(&path);

119
	git_buf_dispose(&path);
120 121 122 123

	return 0;
}

124 125 126 127
GIT_INLINE(int) rebase_readfile(
	git_buf *out,
	git_buf *state_path,
	const char *filename)
128
{
129 130
	size_t state_path_len = state_path->size;
	int error;
131

132 133 134 135
	git_buf_clear(out);

	if ((error = git_buf_joinpath(state_path, state_path->ptr, filename)) < 0 ||
		(error = git_futils_readbuffer(out, state_path->ptr)) < 0)
136 137
		goto done;

138
	git_buf_rtrim(out);
139

140 141 142 143
done:
	git_buf_truncate(state_path, state_path_len);
	return error;
}
144

145 146 147 148
GIT_INLINE(int) rebase_readint(
	size_t *out, git_buf *asc_out, git_buf *state_path, const char *filename)
{
	int32_t num;
149
	const char *eol;
150
	int error = 0;
151

152 153
	if ((error = rebase_readfile(asc_out, state_path, filename)) < 0)
		return error;
154

155
	if (git__strntol32(&num, asc_out->ptr, asc_out->size, &eol, 10) < 0 || num < 0 || *eol) {
156
		git_error_set(GIT_ERROR_REBASE, "the file '%s' contains an invalid numeric value", filename);
157 158
		return -1;
	}
159

160
	*out = (size_t) num;
161

162 163
	return 0;
}
164

165 166 167 168
GIT_INLINE(int) rebase_readoid(
	git_oid *out, git_buf *str_out, git_buf *state_path, const char *filename)
{
	int error;
169

170 171
	if ((error = rebase_readfile(str_out, state_path, filename)) < 0)
		return error;
172

173
	if (str_out->size != GIT_OID_HEXSZ || git_oid_fromstr(out, str_out->ptr) < 0) {
174
		git_error_set(GIT_ERROR_REBASE, "the file '%s' contains an invalid object ID", filename);
175 176
		return -1;
	}
177

178 179
	return 0;
}
180

181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201
static git_rebase_operation *rebase_operation_alloc(
	git_rebase *rebase,
	git_rebase_operation_t type,
	git_oid *id,
	const char *exec)
{
	git_rebase_operation *operation;

	assert((type == GIT_REBASE_OPERATION_EXEC) == !id);
	assert((type == GIT_REBASE_OPERATION_EXEC) == !!exec);

	if ((operation = git_array_alloc(rebase->operations)) == NULL)
		return NULL;

	operation->type = type;
	git_oid_cpy((git_oid *)&operation->id, id);
	operation->exec = exec;

	return operation;
}

202 203 204
static int rebase_open_merge(git_rebase *rebase)
{
	git_buf state_path = GIT_BUF_INIT, buf = GIT_BUF_INIT, cmt = GIT_BUF_INIT;
205
	git_oid id;
206 207 208
	git_rebase_operation *operation;
	size_t i, msgnum = 0, end;
	int error;
209

210 211
	if ((error = git_buf_puts(&state_path, rebase->state_path)) < 0)
		goto done;
212

213 214 215 216
	/* Read 'msgnum' if it exists (otherwise, let msgnum = 0) */
	if ((error = rebase_readint(&msgnum, &buf, &state_path, MSGNUM_FILE)) < 0 &&
		error != GIT_ENOTFOUND)
		goto done;
217

218 219 220 221
	if (msgnum) {
		rebase->started = 1;
		rebase->current = msgnum - 1;
	}
222

223 224
	/* Read 'end' */
	if ((error = rebase_readint(&end, &buf, &state_path, END_FILE)) < 0)
225 226
		goto done;

227
	/* Read 'current' if it exists */
228
	if ((error = rebase_readoid(&id, &buf, &state_path, CURRENT_FILE)) < 0 &&
229 230 231 232 233
		error != GIT_ENOTFOUND)
		goto done;

	/* Read cmt.* */
	git_array_init_to_size(rebase->operations, end);
234
	GIT_ERROR_CHECK_ARRAY(rebase->operations);
235

236 237 238 239
	for (i = 0; i < end; i++) {
		git_buf_clear(&cmt);

		if ((error = git_buf_printf(&cmt, "cmt.%" PRIuZ, (i+1))) < 0 ||
240
			(error = rebase_readoid(&id, &buf, &state_path, cmt.ptr)) < 0)
241
			goto done;
242 243

		operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL);
244
		GIT_ERROR_CHECK_ALLOC(operation);
245
	}
246

247 248 249 250 251 252
	/* Read 'onto_name' */
	if ((error = rebase_readfile(&buf, &state_path, ONTO_NAME_FILE)) < 0)
		goto done;

	rebase->onto_name = git_buf_detach(&buf);

253
done:
254 255 256
	git_buf_dispose(&cmt);
	git_buf_dispose(&state_path);
	git_buf_dispose(&buf);
257 258 259 260

	return error;
}

261
static int rebase_alloc(git_rebase **out, const git_rebase_options *rebase_opts)
262 263
{
	git_rebase *rebase = git__calloc(1, sizeof(git_rebase));
264
	GIT_ERROR_CHECK_ALLOC(rebase);
265

266
	*out = NULL;
267 268 269 270

	if (rebase_opts)
		memcpy(&rebase->options, rebase_opts, sizeof(git_rebase_options));
	else
271
		git_rebase_options_init(&rebase->options, GIT_REBASE_OPTIONS_VERSION);
272 273

	if (rebase_opts && rebase_opts->rewrite_notes_ref) {
274
		rebase->options.rewrite_notes_ref = git__strdup(rebase_opts->rewrite_notes_ref);
275
		GIT_ERROR_CHECK_ALLOC(rebase->options.rewrite_notes_ref);
276 277
	}

278 279 280
	*out = rebase;

	return 0;
281 282 283 284
}

static int rebase_check_versions(const git_rebase_options *given_opts)
{
285
	GIT_ERROR_CHECK_VERSION(given_opts, GIT_REBASE_OPTIONS_VERSION, "git_rebase_options");
286 287

	if (given_opts)
288
		GIT_ERROR_CHECK_VERSION(&given_opts->checkout_options, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options");
289 290 291 292 293 294 295 296

	return 0;
}

int git_rebase_open(
	git_rebase **out,
	git_repository *repo,
	const git_rebase_options *given_opts)
297
{
298
	git_rebase *rebase;
299
	git_buf path = GIT_BUF_INIT, orig_head_name = GIT_BUF_INIT,
300
		orig_head_id = GIT_BUF_INIT, onto_id = GIT_BUF_INIT;
301 302
	size_t state_path_len;
	int error;
303

304 305
	assert(repo);

306 307 308
	if ((error = rebase_check_versions(given_opts)) < 0)
		return error;

309 310
	if (rebase_alloc(&rebase, given_opts) < 0)
		return -1;
311

312 313 314
	rebase->repo = repo;

	if ((error = rebase_state_type(&rebase->type, &rebase->state_path, repo)) < 0)
315 316
		goto done;

317
	if (rebase->type == GIT_REBASE_TYPE_NONE) {
318
		git_error_set(GIT_ERROR_REBASE, "there is no rebase in progress");
Jacques Germishuys committed
319 320
		error = GIT_ENOTFOUND;
		goto done;
321 322
	}

323
	if ((error = git_buf_puts(&path, rebase->state_path)) < 0)
324 325 326 327 328 329 330 331 332 333 334
		goto done;

	state_path_len = git_buf_len(&path);

	if ((error = git_buf_joinpath(&path, path.ptr, HEAD_NAME_FILE)) < 0 ||
		(error = git_futils_readbuffer(&orig_head_name, path.ptr)) < 0)
		goto done;

	git_buf_rtrim(&orig_head_name);

	if (strcmp(ORIG_DETACHED_HEAD, orig_head_name.ptr) == 0)
335
		rebase->head_detached = 1;
336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354

	git_buf_truncate(&path, state_path_len);

	if ((error = git_buf_joinpath(&path, path.ptr, ORIG_HEAD_FILE)) < 0)
		goto done;

	if (!git_path_isfile(path.ptr)) {
		/* Previous versions of git.git used 'head' here; support that. */
		git_buf_truncate(&path, state_path_len);

		if ((error = git_buf_joinpath(&path, path.ptr, HEAD_FILE)) < 0)
			goto done;
	}

	if ((error = git_futils_readbuffer(&orig_head_id, path.ptr)) < 0)
		goto done;

	git_buf_rtrim(&orig_head_id);

355
	if ((error = git_oid_fromstr(&rebase->orig_head_id, orig_head_id.ptr)) < 0)
356 357
		goto done;

358 359 360 361 362 363 364 365
	git_buf_truncate(&path, state_path_len);

	if ((error = git_buf_joinpath(&path, path.ptr, ONTO_FILE)) < 0 ||
		(error = git_futils_readbuffer(&onto_id, path.ptr)) < 0)
		goto done;

	git_buf_rtrim(&onto_id);

366
	if ((error = git_oid_fromstr(&rebase->onto_id, onto_id.ptr)) < 0)
367 368
		goto done;

369 370
	if (!rebase->head_detached)
		rebase->orig_head_name = git_buf_detach(&orig_head_name);
371

372
	switch (rebase->type) {
373
	case GIT_REBASE_TYPE_INTERACTIVE:
374
		git_error_set(GIT_ERROR_REBASE, "interactive rebase is not supported");
375 376 377
		error = -1;
		break;
	case GIT_REBASE_TYPE_MERGE:
378
		error = rebase_open_merge(rebase);
379 380
		break;
	case GIT_REBASE_TYPE_APPLY:
381
		git_error_set(GIT_ERROR_REBASE, "patch application rebase is not supported");
382 383 384 385 386 387
		error = -1;
		break;
	default:
		abort();
	}

388
done:
389 390 391 392 393
	if (error == 0)
		*out = rebase;
	else
		git_rebase_free(rebase);

394 395 396 397
	git_buf_dispose(&path);
	git_buf_dispose(&orig_head_name);
	git_buf_dispose(&orig_head_id);
	git_buf_dispose(&onto_id);
398 399 400
	return error;
}

401
static int rebase_cleanup(git_rebase *rebase)
402
{
403 404 405
	if (!rebase || rebase->inmemory)
		return 0;

406 407
	return git_path_isdir(rebase->state_path) ?
		git_futils_rmdir_r(rebase->state_path, NULL, GIT_RMDIR_REMOVE_FILES) :
408 409 410
		0;
}

411
static int rebase_setupfile(git_rebase *rebase, const char *filename, int flags, const char *fmt, ...)
412 413 414 415 416 417 418 419 420 421
{
	git_buf path = GIT_BUF_INIT,
		contents = GIT_BUF_INIT;
	va_list ap;
	int error;

	va_start(ap, fmt);
	git_buf_vprintf(&contents, fmt, ap);
	va_end(ap);

422
	if ((error = git_buf_joinpath(&path, rebase->state_path, filename)) == 0)
423
		error = git_futils_writebuffer(&contents, path.ptr, flags, REBASE_FILE_MODE);
424

425 426
	git_buf_dispose(&path);
	git_buf_dispose(&contents);
427 428 429 430

	return error;
}

431
static const char *rebase_onto_name(const git_annotated_commit *onto)
432 433 434 435 436 437
{
	if (onto->ref_name && git__strncmp(onto->ref_name, "refs/heads/", 11) == 0)
		return onto->ref_name + 11;
	else if (onto->ref_name)
		return onto->ref_name;
	else
438
		return onto->id_str;
439 440
}

441
static int rebase_setupfiles_merge(git_rebase *rebase)
442 443 444
{
	git_buf commit_filename = GIT_BUF_INIT;
	char id_str[GIT_OID_HEXSZ];
445 446 447
	git_rebase_operation *operation;
	size_t i;
	int error = 0;
448

449 450
	if ((error = rebase_setupfile(rebase, END_FILE, 0, "%" PRIuZ "\n", git_array_size(rebase->operations))) < 0 ||
		(error = rebase_setupfile(rebase, ONTO_NAME_FILE, 0, "%s\n", rebase->onto_name)) < 0)
451 452
		goto done;

453 454
	for (i = 0; i < git_array_size(rebase->operations); i++) {
		operation = git_array_get(rebase->operations, i);
455 456

		git_buf_clear(&commit_filename);
457 458 459
		git_buf_printf(&commit_filename, CMT_FILE_FMT, i+1);

		git_oid_fmt(id_str, &operation->id);
460

461
		if ((error = rebase_setupfile(rebase, commit_filename.ptr, 0,
462 463 464 465 466
				"%.*s\n", GIT_OID_HEXSZ, id_str)) < 0)
			goto done;
	}

done:
467
	git_buf_dispose(&commit_filename);
468 469 470
	return error;
}

471
static int rebase_setupfiles(git_rebase *rebase)
472
{
473
	char onto[GIT_OID_HEXSZ], orig_head[GIT_OID_HEXSZ];
474
	const char *orig_head_name;
475

476 477
	git_oid_fmt(onto, &rebase->onto_id);
	git_oid_fmt(orig_head, &rebase->orig_head_id);
478

479
	if (p_mkdir(rebase->state_path, REBASE_DIR_MODE) < 0) {
480
		git_error_set(GIT_ERROR_OS, "failed to create rebase directory '%s'", rebase->state_path);
481
		return -1;
482 483
	}

484 485 486
	orig_head_name = rebase->head_detached ? ORIG_DETACHED_HEAD :
		rebase->orig_head_name;

487
	if (git_repository__set_orig_head(rebase->repo, &rebase->orig_head_id) < 0 ||
488 489 490 491
		rebase_setupfile(rebase, HEAD_NAME_FILE, 0, "%s\n", orig_head_name) < 0 ||
		rebase_setupfile(rebase, ONTO_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, onto) < 0 ||
		rebase_setupfile(rebase, ORIG_HEAD_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, orig_head) < 0 ||
		rebase_setupfile(rebase, QUIET_FILE, 0, rebase->quiet ? "t\n" : "\n") < 0)
492
		return -1;
493

494
	return rebase_setupfiles_merge(rebase);
495 496
}

497
int git_rebase_options_init(git_rebase_options *opts, unsigned int version)
498 499 500 501 502 503
{
	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
		opts, version, git_rebase_options, GIT_REBASE_OPTIONS_INIT);
	return 0;
}

504 505 506 507 508
int git_rebase_init_options(git_rebase_options *opts, unsigned int version)
{
	return git_rebase_options_init(opts, version);
}

509 510 511 512 513 514 515 516 517
static int rebase_ensure_not_in_progress(git_repository *repo)
{
	int error;
	git_rebase_type_t type;

	if ((error = rebase_state_type(&type, NULL, repo)) < 0)
		return error;

	if (type != GIT_REBASE_TYPE_NONE) {
518
		git_error_set(GIT_ERROR_REBASE, "there is an existing rebase in progress");
519 520 521 522 523 524
		return -1;
	}

	return 0;
}

525 526 527 528 529
static int rebase_ensure_not_dirty(
	git_repository *repo,
	bool check_index,
	bool check_workdir,
	int fail_with)
530 531 532 533
{
	git_tree *head = NULL;
	git_index *index = NULL;
	git_diff *diff = NULL;
534
	int error = 0;
535

536 537 538 539 540
	if (check_index) {
		if ((error = git_repository_head_tree(&head, repo)) < 0 ||
			(error = git_repository_index(&index, repo)) < 0 ||
			(error = git_diff_tree_to_index(&diff, repo, head, index, NULL)) < 0)
			goto done;
541

542
		if (git_diff_num_deltas(diff) > 0) {
543
			git_error_set(GIT_ERROR_REBASE, "uncommitted changes exist in index");
544 545 546
			error = fail_with;
			goto done;
		}
547

548 549 550
		git_diff_free(diff);
		diff = NULL;
	}
551

552
	if (check_workdir) {
553 554 555
		git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
		diff_opts.ignore_submodules = GIT_SUBMODULE_IGNORE_UNTRACKED;
		if ((error = git_diff_index_to_workdir(&diff, repo, index, &diff_opts)) < 0)
556
			goto done;
557

558
		if (git_diff_num_deltas(diff) > 0) {
559
			git_error_set(GIT_ERROR_REBASE, "unstaged changes exist in workdir");
560 561 562
			error = fail_with;
			goto done;
		}
563 564 565 566 567 568 569 570 571 572
	}

done:
	git_diff_free(diff);
	git_index_free(index);
	git_tree_free(head);

	return error;
}

573 574 575
static int rebase_init_operations(
	git_rebase *rebase,
	git_repository *repo,
576 577 578
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto)
579 580 581 582 583 584 585 586 587 588 589 590
{
	git_revwalk *revwalk = NULL;
	git_commit *commit;
	git_oid id;
	bool merge;
	git_rebase_operation *operation;
	int error;

	if (!upstream)
		upstream = onto;

	if ((error = git_revwalk_new(&revwalk, rebase->repo)) < 0 ||
591 592
		(error = git_revwalk_push(revwalk, git_annotated_commit_id(branch))) < 0 ||
		(error = git_revwalk_hide(revwalk, git_annotated_commit_id(upstream))) < 0)
593 594
		goto done;

595
	git_revwalk_sorting(revwalk, GIT_SORT_REVERSE);
596 597 598 599 600 601 602 603 604 605 606

	while ((error = git_revwalk_next(&id, revwalk)) == 0) {
		if ((error = git_commit_lookup(&commit, repo, &id)) < 0)
			goto done;

		merge = (git_commit_parentcount(commit) > 1);
		git_commit_free(commit);

		if (merge)
			continue;

607
		operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL);
608
		GIT_ERROR_CHECK_ALLOC(operation);
609 610 611 612 613 614 615 616 617 618 619 620
	}

	error = 0;

done:
	git_revwalk_free(revwalk);
	return error;
}

static int rebase_init_merge(
	git_rebase *rebase,
	git_repository *repo,
621 622 623
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto)
624
{
625
	git_reference *head_ref = NULL;
626 627
	git_commit *onto_commit = NULL;
	git_buf reflog = GIT_BUF_INIT;
628 629 630
	git_buf state_path = GIT_BUF_INIT;
	int error;

631 632
	GIT_UNUSED(upstream);

633
	if ((error = git_buf_joinpath(&state_path, repo->gitdir, REBASE_MERGE_DIR)) < 0)
634 635
		goto done;

636
	rebase->state_path = git_buf_detach(&state_path);
637
	GIT_ERROR_CHECK_ALLOC(rebase->state_path);
638

639
	if (branch->ref_name && strcmp(branch->ref_name, "HEAD")) {
640
		rebase->orig_head_name = git__strdup(branch->ref_name);
641
		GIT_ERROR_CHECK_ALLOC(rebase->orig_head_name);
642 643 644
	} else {
		rebase->head_detached = 1;
	}
645 646

	rebase->onto_name = git__strdup(rebase_onto_name(onto));
647
	GIT_ERROR_CHECK_ALLOC(rebase->onto_name);
648

649
	rebase->quiet = rebase->options.quiet;
650

651 652
	git_oid_cpy(&rebase->orig_head_id, git_annotated_commit_id(branch));
	git_oid_cpy(&rebase->onto_id, git_annotated_commit_id(onto));
653

654 655 656 657 658 659 660 661 662 663
	if ((error = rebase_setupfiles(rebase)) < 0 ||
		(error = git_buf_printf(&reflog,
			"rebase: checkout %s", rebase_onto_name(onto))) < 0 ||
		(error = git_commit_lookup(
			&onto_commit, repo, git_annotated_commit_id(onto))) < 0 ||
		(error = git_checkout_tree(repo,
			(git_object *)onto_commit, &rebase->options.checkout_options)) < 0 ||
		(error = git_reference_create(&head_ref, repo, GIT_HEAD_FILE,
			git_annotated_commit_id(onto), 1, reflog.ptr)) < 0)
		goto done;
664

665 666
done:
	git_reference_free(head_ref);
667
	git_commit_free(onto_commit);
668 669
	git_buf_dispose(&reflog);
	git_buf_dispose(&state_path);
670

671 672 673
	return error;
}

674 675 676 677 678 679 680 681 682 683 684 685 686 687
static int rebase_init_inmemory(
	git_rebase *rebase,
	git_repository *repo,
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto)
{
	GIT_UNUSED(branch);
	GIT_UNUSED(upstream);

	return git_commit_lookup(
		&rebase->last_commit, repo, git_annotated_commit_id(onto));
}

688 689
int git_rebase_init(
	git_rebase **out,
690
	git_repository *repo,
691 692 693
	const git_annotated_commit *branch,
	const git_annotated_commit *upstream,
	const git_annotated_commit *onto,
694
	const git_rebase_options *given_opts)
695
{
696
	git_rebase *rebase = NULL;
697
	git_annotated_commit *head_branch = NULL;
698
	git_reference *head_ref = NULL;
699
	bool inmemory = (given_opts && given_opts->inmemory);
700 701
	int error;

702
	assert(repo && (upstream || onto));
703

704 705 706 707 708
	*out = NULL;

	if (!onto)
		onto = upstream;

709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725
	if ((error = rebase_check_versions(given_opts)) < 0)
		goto done;

	if (!inmemory) {
		if ((error = git_repository__ensure_not_bare(repo, "rebase")) < 0 ||
			(error = rebase_ensure_not_in_progress(repo)) < 0 ||
			(error = rebase_ensure_not_dirty(repo, true, true, GIT_ERROR)) < 0)
			goto done;
	}

	if (!branch) {
		if ((error = git_repository_head(&head_ref, repo)) < 0 ||
			(error = git_annotated_commit_from_ref(&head_branch, repo, head_ref)) < 0)
			goto done;

		branch = head_branch;
	}
726

727 728
	if (rebase_alloc(&rebase, given_opts) < 0)
		return -1;
729

730 731 732 733 734
	rebase->repo = repo;
	rebase->inmemory = inmemory;
	rebase->type = GIT_REBASE_TYPE_MERGE;

	if ((error = rebase_init_operations(rebase, repo, branch, upstream, onto)) < 0)
735 736
		goto done;

737 738 739
	if (inmemory)
		error = rebase_init_inmemory(rebase, repo, branch, upstream, onto);
	else
740
		error = rebase_init_merge(rebase, repo, branch ,upstream, onto);
741 742 743

	if (error == 0)
		*out = rebase;
744 745

done:
746
	git_reference_free(head_ref);
747 748
	git_annotated_commit_free(head_branch);

749 750 751 752 753
	if (error < 0) {
		rebase_cleanup(rebase);
		git_rebase_free(rebase);
	}

754 755
	return error;
}
756

757
static void normalize_checkout_options_for_apply(
758
	git_checkout_options *checkout_opts,
759 760
	git_rebase *rebase,
	git_commit *current_commit)
761
{
762
	memcpy(checkout_opts, &rebase->options.checkout_options, sizeof(git_checkout_options));
763 764 765 766

	if (!checkout_opts->ancestor_label)
		checkout_opts->ancestor_label = "ancestor";

767
	if (rebase->type == GIT_REBASE_TYPE_MERGE) {
768
		if (!checkout_opts->our_label)
769
			checkout_opts->our_label = rebase->onto_name;
770

771 772
		if (!checkout_opts->their_label)
			checkout_opts->their_label = git_commit_summary(current_commit);
773 774 775 776 777
	} else {
		abort();
	}
}

778 779 780 781 782 783 784 785 786 787 788 789 790
GIT_INLINE(int) rebase_movenext(git_rebase *rebase)
{
	size_t next = rebase->started ? rebase->current + 1 : 0;

	if (next == git_array_size(rebase->operations))
		return GIT_ITEROVER;

	rebase->started = 1;
	rebase->current = next;

	return 0;
}

791
static int rebase_next_merge(
792
	git_rebase_operation **out,
793
	git_rebase *rebase)
794
{
795 796
	git_buf path = GIT_BUF_INIT;
	git_commit *current_commit = NULL, *parent_commit = NULL;
797 798
	git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL;
	git_index *index = NULL;
799
	git_indexwriter indexwriter = GIT_INDEXWRITER_INIT;
800
	git_rebase_operation *operation;
801
	git_checkout_options checkout_opts;
802
	char current_idstr[GIT_OID_HEXSZ];
803 804 805
	unsigned int parent_count;
	int error;

806
	*out = NULL;
807

808
	operation = git_array_get(rebase->operations, rebase->current);
809

810 811
	if ((error = git_commit_lookup(&current_commit, rebase->repo, &operation->id)) < 0 ||
		(error = git_commit_tree(&current_tree, current_commit)) < 0 ||
812
		(error = git_repository_head_tree(&head_tree, rebase->repo)) < 0)
813 814
		goto done;

815
	if ((parent_count = git_commit_parentcount(current_commit)) > 1) {
816
		git_error_set(GIT_ERROR_REBASE, "cannot rebase a merge commit");
817 818 819
		error = -1;
		goto done;
	} else if (parent_count) {
820
		if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 ||
821 822 823 824
			(error = git_commit_tree(&parent_tree, parent_commit)) < 0)
			goto done;
	}

825 826
	git_oid_fmt(current_idstr, &operation->id);

827
	normalize_checkout_options_for_apply(&checkout_opts, rebase, current_commit);
828

829
	if ((error = git_indexwriter_init_for_operation(&indexwriter, rebase->repo, &checkout_opts.checkout_strategy)) < 0 ||
830 831
		(error = rebase_setupfile(rebase, MSGNUM_FILE, 0, "%" PRIuZ "\n", rebase->current+1)) < 0 ||
		(error = rebase_setupfile(rebase, CURRENT_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, current_idstr)) < 0 ||
832
		(error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0 ||
833
		(error = git_merge__check_result(rebase->repo, index)) < 0 ||
834 835
		(error = git_checkout_index(rebase->repo, index, &checkout_opts)) < 0 ||
		(error = git_indexwriter_commit(&indexwriter)) < 0)
836 837
		goto done;

838
	*out = operation;
839

840
done:
841
	git_indexwriter_cleanup(&indexwriter);
842 843 844 845 846
	git_index_free(index);
	git_tree_free(current_tree);
	git_tree_free(head_tree);
	git_tree_free(parent_tree);
	git_commit_free(parent_commit);
847
	git_commit_free(current_commit);
848
	git_buf_dispose(&path);
849 850 851 852

	return error;
}

853 854 855 856 857 858 859 860
static int rebase_next_inmemory(
	git_rebase_operation **out,
	git_rebase *rebase)
{
	git_commit *current_commit = NULL, *parent_commit = NULL;
	git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL;
	git_rebase_operation *operation;
	git_index *index = NULL;
861
	unsigned int parent_count;
862 863 864 865 866 867 868
	int error;

	*out = NULL;

	operation = git_array_get(rebase->operations, rebase->current);

	if ((error = git_commit_lookup(&current_commit, rebase->repo, &operation->id)) < 0 ||
869 870 871 872
		(error = git_commit_tree(&current_tree, current_commit)) < 0)
		goto done;

	if ((parent_count = git_commit_parentcount(current_commit)) > 1) {
873
		git_error_set(GIT_ERROR_REBASE, "cannot rebase a merge commit");
874 875 876 877 878 879 880 881 882
		error = -1;
		goto done;
	} else if (parent_count) {
		if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 ||
			(error = git_commit_tree(&parent_tree, parent_commit)) < 0)
			goto done;
	}

	if ((error = git_commit_tree(&head_tree, rebase->last_commit)) < 0 ||
883
		(error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0)
884 885
		goto done;

886 887 888 889 890 891 892
	if (!rebase->index) {
		rebase->index = index;
		index = NULL;
	} else {
		if ((error = git_index_read_index(rebase->index, index)) < 0)
			goto done;
	}
893 894 895 896 897 898 899 900 901 902 903 904 905 906

	*out = operation;

done:
	git_commit_free(current_commit);
	git_commit_free(parent_commit);
	git_tree_free(current_tree);
	git_tree_free(head_tree);
	git_tree_free(parent_tree);
	git_index_free(index);

	return error;
}

907
int git_rebase_next(
908
	git_rebase_operation **out,
909
	git_rebase *rebase)
910 911 912
{
	int error;

913
	assert(out && rebase);
914

915 916 917 918 919 920
	if ((error = rebase_movenext(rebase)) < 0)
		return error;

	if (rebase->inmemory)
		error = rebase_next_inmemory(out, rebase);
	else if (rebase->type == GIT_REBASE_TYPE_MERGE)
921
		error = rebase_next_merge(out, rebase);
922
	else
923 924
		abort();

925 926 927
	return error;
}

928 929 930 931 932 933 934 935 936 937 938 939
int git_rebase_inmemory_index(
	git_index **out,
	git_rebase *rebase)
{
	assert(out && rebase && rebase->index);

	GIT_REFCOUNT_INC(rebase->index);
	*out = rebase->index;

	return 0;
}

940 941
static int rebase_commit__create(
	git_commit **out,
942
	git_rebase *rebase,
943 944
	git_index *index,
	git_commit *parent_commit,
945 946 947 948 949
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
950
	git_rebase_operation *operation;
951 952 953
	git_commit *current_commit = NULL, *commit = NULL;
	git_tree *parent_tree = NULL, *tree = NULL;
	git_oid tree_id, commit_id;
954 955
	git_buf commit_content = GIT_BUF_INIT, commit_signature = GIT_BUF_INIT,
		signature_field = GIT_BUF_INIT;
956 957
	const char *signature_field_string = NULL,
		*commit_signature_string = NULL;
958 959
	int error;

960
	operation = git_array_get(rebase->operations, rebase->current);
961 962

	if (git_index_has_conflicts(index)) {
963
		git_error_set(GIT_ERROR_REBASE, "conflicts have not been resolved");
964
		error = GIT_EUNMERGED;
965 966 967
		goto done;
	}

968 969 970 971
	if ((error = git_commit_lookup(&current_commit, rebase->repo, &operation->id)) < 0 ||
		(error = git_commit_tree(&parent_tree, parent_commit)) < 0 ||
		(error = git_index_write_tree_to(&tree_id, index, rebase->repo)) < 0 ||
		(error = git_tree_lookup(&tree, rebase->repo, &tree_id)) < 0)
972 973
		goto done;

974
	if (git_oid_equal(&tree_id, git_tree_id(parent_tree))) {
975
		git_error_set(GIT_ERROR_REBASE, "this patch has already been applied");
976 977 978 979
		error = GIT_EAPPLIED;
		goto done;
	}

980
	if (!author)
981
		author = git_commit_author(current_commit);
982 983

	if (!message) {
984 985
		message_encoding = git_commit_message_encoding(current_commit);
		message = git_commit_message(current_commit);
986 987
	}

988 989 990 991
	if ((error = git_commit_create_buffer(&commit_content, rebase->repo, author, committer,
			message_encoding, message, tree, 1, (const git_commit **)&parent_commit)) < 0)
		goto done;

992
	if (rebase->options.signing_cb) {
993 994 995 996 997 998 999 1000 1001 1002
		git_error_clear();
		error = git_error_set_after_callback_function(rebase->options.signing_cb(
			&commit_signature, &signature_field, git_buf_cstr(&commit_content),
			rebase->options.payload), "commit signing_cb failed");
		if (error == GIT_PASSTHROUGH) {
			git_buf_dispose(&commit_signature);
			git_buf_dispose(&signature_field);
			git_error_clear();
			error = GIT_OK;
		} else if (error < 0)
1003
			goto done;
1004
	}
1005

1006 1007 1008
	if (git_buf_is_allocated(&commit_signature)) {
		assert(git_buf_contains_nul(&commit_signature));
		commit_signature_string = git_buf_cstr(&commit_signature);
1009 1010
	}

1011 1012 1013 1014 1015 1016 1017 1018
	if (git_buf_is_allocated(&signature_field)) {
		assert(git_buf_contains_nul(&signature_field));
		signature_field_string = git_buf_cstr(&signature_field);
	}

	if ((error = git_commit_create_with_signature(&commit_id, rebase->repo,
			git_buf_cstr(&commit_content), commit_signature_string,
			signature_field_string)))
1019 1020 1021
		goto done;

	if ((error = git_commit_lookup(&commit, rebase->repo, &commit_id)) < 0)
1022 1023 1024 1025 1026 1027 1028 1029
		goto done;

	*out = commit;

done:
	if (error < 0)
		git_commit_free(commit);

1030 1031
	git_buf_dispose(&commit_signature);
	git_buf_dispose(&signature_field);
1032
	git_buf_dispose(&commit_content);
1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059
	git_commit_free(current_commit);
	git_tree_free(parent_tree);
	git_tree_free(tree);

	return error;
}

static int rebase_commit_merge(
	git_oid *commit_id,
	git_rebase *rebase,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
	git_rebase_operation *operation;
	git_reference *head = NULL;
	git_commit *head_commit = NULL, *commit = NULL;
	git_index *index = NULL;
	char old_idstr[GIT_OID_HEXSZ], new_idstr[GIT_OID_HEXSZ];
	int error;

	operation = git_array_get(rebase->operations, rebase->current);
	assert(operation);

	if ((error = rebase_ensure_not_dirty(rebase->repo, false, true, GIT_EUNMERGED)) < 0 ||
		(error = git_repository_head(&head, rebase->repo)) < 0 ||
1060
		(error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT)) < 0 ||
1061 1062 1063
		(error = git_repository_index(&index, rebase->repo)) < 0 ||
		(error = rebase_commit__create(&commit, rebase, index, head_commit,
			author, committer, message_encoding, message)) < 0 ||
1064
		(error = git_reference__update_for_commit(
1065
			rebase->repo, NULL, "HEAD", git_commit_id(commit), "rebase")) < 0)
1066 1067
		goto done;

1068 1069 1070 1071 1072 1073
	git_oid_fmt(old_idstr, &operation->id);
	git_oid_fmt(new_idstr, git_commit_id(commit));

	if ((error = rebase_setupfile(rebase, REWRITTEN_FILE, O_CREAT|O_WRONLY|O_APPEND,
		"%.*s %.*s\n", GIT_OID_HEXSZ, old_idstr, GIT_OID_HEXSZ, new_idstr)) < 0)
		goto done;
1074

1075
	git_oid_cpy(commit_id, git_commit_id(commit));
1076 1077 1078

done:
	git_index_free(index);
1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095
	git_reference_free(head);
	git_commit_free(head_commit);
	git_commit_free(commit);
	return error;
}

static int rebase_commit_inmemory(
	git_oid *commit_id,
	git_rebase *rebase,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
	git_commit *commit = NULL;
	int error = 0;

1096
	assert(rebase->index);
1097
	assert(rebase->last_commit);
1098
	assert(rebase->current < rebase->operations.size);
1099

1100
	if ((error = rebase_commit__create(&commit, rebase, rebase->index,
1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111
		rebase->last_commit, author, committer, message_encoding, message)) < 0)
		goto done;

	git_commit_free(rebase->last_commit);
	rebase->last_commit = commit;

	git_oid_cpy(commit_id, git_commit_id(commit));

done:
	if (error < 0)
		git_commit_free(commit);
1112 1113 1114 1115 1116 1117

	return error;
}

int git_rebase_commit(
	git_oid *id,
1118
	git_rebase *rebase,
1119 1120 1121 1122 1123 1124 1125
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message)
{
	int error;

1126
	assert(rebase && committer);
1127

1128 1129 1130 1131
	if (rebase->inmemory)
		error = rebase_commit_inmemory(
			id, rebase, author, committer, message_encoding, message);
	else if (rebase->type == GIT_REBASE_TYPE_MERGE)
1132
		error = rebase_commit_merge(
1133
			id, rebase, author, committer, message_encoding, message);
1134
	else
1135 1136
		abort();

1137 1138 1139
	return error;
}

1140
int git_rebase_abort(git_rebase *rebase)
1141 1142 1143 1144 1145
{
	git_reference *orig_head_ref = NULL;
	git_commit *orig_head_commit = NULL;
	int error;

1146
	assert(rebase);
1147

1148 1149 1150
	if (rebase->inmemory)
		return 0;

1151 1152
	error = rebase->head_detached ?
		git_reference_create(&orig_head_ref, rebase->repo, GIT_HEAD_FILE,
1153
			 &rebase->orig_head_id, 1, "rebase: aborting") :
1154
		git_reference_symbolic_create(
1155
			&orig_head_ref, rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1,
1156
			"rebase: aborting");
1157 1158 1159 1160 1161

	if (error < 0)
		goto done;

	if ((error = git_commit_lookup(
1162 1163
			&orig_head_commit, rebase->repo, &rebase->orig_head_id)) < 0 ||
		(error = git_reset(rebase->repo, (git_object *)orig_head_commit,
1164
			GIT_RESET_HARD, &rebase->options.checkout_options)) < 0)
1165 1166
		goto done;

1167
	error = rebase_cleanup(rebase);
1168 1169 1170 1171 1172 1173 1174

done:
	git_commit_free(orig_head_commit);
	git_reference_free(orig_head_ref);

	return error;
}
1175

1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193
static int notes_ref_lookup(git_buf *out, git_rebase *rebase)
{
	git_config *config = NULL;
	int do_rewrite, error;

	if (rebase->options.rewrite_notes_ref) {
		git_buf_attach_notowned(out,
			rebase->options.rewrite_notes_ref,
			strlen(rebase->options.rewrite_notes_ref));
		return 0;
	}

	if ((error = git_repository_config(&config, rebase->repo)) < 0 ||
		(error = git_config_get_bool(&do_rewrite, config, "notes.rewrite.rebase")) < 0) {

		if (error != GIT_ENOTFOUND)
			goto done;

1194
		git_error_clear();
1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206
		do_rewrite = 1;
	}

	error = do_rewrite ?
		git_config_get_string_buf(out, config, "notes.rewriteref") :
		GIT_ENOTFOUND;

done:
	git_config_free(config);
	return error;
}

1207
static int rebase_copy_note(
1208
	git_rebase *rebase,
1209
	const char *notes_ref,
1210 1211
	git_oid *from,
	git_oid *to,
1212
	const git_signature *committer)
1213
{
1214 1215
	git_note *note = NULL;
	git_oid note_id;
1216
	git_signature *who = NULL;
1217 1218
	int error;

1219
	if ((error = git_note_read(&note, rebase->repo, notes_ref, from)) < 0) {
1220
		if (error == GIT_ENOTFOUND) {
1221
			git_error_clear();
1222 1223 1224 1225 1226 1227
			error = 0;
		}

		goto done;
	}

1228 1229 1230 1231 1232 1233
	if (!committer) {
		if((error = git_signature_default(&who, rebase->repo)) < 0) {
			if (error != GIT_ENOTFOUND ||
				(error = git_signature_now(&who, "unknown", "unknown")) < 0)
				goto done;

1234
			git_error_clear();
1235 1236 1237 1238 1239
		}

		committer = who;
	}

1240
	error = git_note_create(&note_id, rebase->repo, notes_ref,
1241
		git_note_author(note), committer, to, git_note_message(note), 0);
1242 1243 1244

done:
	git_note_free(note);
1245
	git_signature_free(who);
1246 1247 1248 1249 1250

	return error;
}

static int rebase_copy_notes(
1251
	git_rebase *rebase,
1252
	const git_signature *committer)
1253
{
1254
	git_buf path = GIT_BUF_INIT, rewritten = GIT_BUF_INIT, notes_ref = GIT_BUF_INIT;
1255 1256 1257 1258 1259
	char *pair_list, *fromstr, *tostr, *end;
	git_oid from, to;
	unsigned int linenum = 1;
	int error = 0;

1260 1261
	if ((error = notes_ref_lookup(&notes_ref, rebase)) < 0) {
		if (error == GIT_ENOTFOUND) {
1262
			git_error_clear();
1263 1264 1265
			error = 0;
		}

1266
		goto done;
1267
	}
1268

1269
	if ((error = git_buf_joinpath(&path, rebase->state_path, REWRITTEN_FILE)) < 0 ||
1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295
		(error = git_futils_readbuffer(&rewritten, path.ptr)) < 0)
		goto done;

	pair_list = rewritten.ptr;

	while (*pair_list) {
		fromstr = pair_list;

		if ((end = strchr(fromstr, '\n')) == NULL)
			goto on_error;

		pair_list = end+1;
		*end = '\0';

		if ((end = strchr(fromstr, ' ')) == NULL)
			goto on_error;

		tostr = end+1;
		*end = '\0';

		if (strlen(fromstr) != GIT_OID_HEXSZ ||
			strlen(tostr) != GIT_OID_HEXSZ ||
			git_oid_fromstr(&from, fromstr) < 0 ||
			git_oid_fromstr(&to, tostr) < 0)
			goto on_error;

1296
		if ((error = rebase_copy_note(rebase, notes_ref.ptr, &from, &to, committer)) < 0)
1297 1298 1299 1300 1301 1302 1303 1304
			goto done;

		linenum++;
	}

	goto done;

on_error:
1305
	git_error_set(GIT_ERROR_REBASE, "invalid rewritten file at line %d", linenum);
1306 1307 1308
	error = -1;

done:
1309 1310 1311
	git_buf_dispose(&rewritten);
	git_buf_dispose(&path);
	git_buf_dispose(&notes_ref);
1312 1313 1314 1315

	return error;
}

1316
static int return_to_orig_head(git_rebase *rebase)
1317
{
1318 1319 1320 1321
	git_reference *terminal_ref = NULL, *branch_ref = NULL, *head_ref = NULL;
	git_commit *terminal_commit = NULL;
	git_buf branch_msg = GIT_BUF_INIT, head_msg = GIT_BUF_INIT;
	char onto[GIT_OID_HEXSZ];
1322
	int error = 0;
1323

1324
	git_oid_fmt(onto, &rebase->onto_id);
1325

1326 1327 1328 1329 1330 1331 1332
	if ((error = git_buf_printf(&branch_msg,
			"rebase finished: %s onto %.*s",
			rebase->orig_head_name, GIT_OID_HEXSZ, onto)) == 0 &&
		(error = git_buf_printf(&head_msg,
			"rebase finished: returning to %s",
			rebase->orig_head_name)) == 0 &&
		(error = git_repository_head(&terminal_ref, rebase->repo)) == 0 &&
1333
		(error = git_reference_peel((git_object **)&terminal_commit,
1334
			terminal_ref, GIT_OBJECT_COMMIT)) == 0 &&
1335
		(error = git_reference_create_matching(&branch_ref,
1336 1337 1338 1339
			rebase->repo, rebase->orig_head_name,
			git_commit_id(terminal_commit), 1,
			&rebase->orig_head_id, branch_msg.ptr)) == 0)
		error = git_reference_symbolic_create(&head_ref,
1340
			rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1,
1341
			head_msg.ptr);
1342

1343 1344
	git_buf_dispose(&head_msg);
	git_buf_dispose(&branch_msg);
1345 1346 1347 1348 1349 1350 1351 1352
	git_commit_free(terminal_commit);
	git_reference_free(head_ref);
	git_reference_free(branch_ref);
	git_reference_free(terminal_ref);

	return error;
}

1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372
int git_rebase_finish(
	git_rebase *rebase,
	const git_signature *signature)
{
	int error = 0;

	assert(rebase);

	if (rebase->inmemory)
		return 0;

	if (!rebase->head_detached)
		error = return_to_orig_head(rebase);

	if (error == 0 && (error = rebase_copy_notes(rebase, signature)) == 0)
		error = rebase_cleanup(rebase);

	return error;
}

1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388
const char *git_rebase_orig_head_name(git_rebase *rebase) {
	return rebase->orig_head_name;
}

const git_oid *git_rebase_orig_head_id(git_rebase *rebase) {
	return &rebase->orig_head_id;
}

const char *git_rebase_onto_name(git_rebase *rebase) {
	return rebase->onto_name;
}

const git_oid *git_rebase_onto_id(git_rebase *rebase) {
	return &rebase->onto_id;
}

1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399
size_t git_rebase_operation_entrycount(git_rebase *rebase)
{
	assert(rebase);

	return git_array_size(rebase->operations);
}

size_t git_rebase_operation_current(git_rebase *rebase)
{
	assert(rebase);

1400
	return rebase->started ? rebase->current : GIT_REBASE_NO_OPERATION;
1401 1402 1403 1404 1405 1406 1407 1408 1409
}

git_rebase_operation *git_rebase_operation_byindex(git_rebase *rebase, size_t idx)
{
	assert(rebase);

	return git_array_get(rebase->operations, idx);
}

1410 1411 1412 1413 1414
void git_rebase_free(git_rebase *rebase)
{
	if (rebase == NULL)
		return;

1415
	git_index_free(rebase->index);
1416
	git_commit_free(rebase->last_commit);
1417
	git__free(rebase->onto_name);
1418 1419
	git__free(rebase->orig_head_name);
	git__free(rebase->state_path);
1420
	git_array_clear(rebase->operations);
1421
	git__free((char *)rebase->options.rewrite_notes_ref);
1422
	git__free(rebase);
1423
}