reset.c 3 KB
Newer Older
nulltoken committed
1
/*
Edward Thomson committed
2
 * Copyright (C) the libgit2 contributors. All rights reserved.
nulltoken committed
3 4 5 6 7 8 9 10
 *
 * 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"
#include "commit.h"
#include "tag.h"
Edward Thomson committed
11
#include "merge.h"
nulltoken committed
12
#include "git2/reset.h"
13
#include "git2/checkout.h"
Edward Thomson committed
14
#include "git2/merge.h"
nulltoken committed
15 16 17

#define ERROR_MSG "Cannot perform reset"

18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
static int update_head(git_repository *repo, git_object *commit)
{
	int error;
	git_reference *head = NULL, *target = NULL;

	error = git_repository_head(&head, repo);

	if (error < 0 && error != GIT_EORPHANEDHEAD)
		return error;

	if (error == GIT_EORPHANEDHEAD) {
		giterr_clear();

		/*
		 * TODO: This is a bit weak as this doesn't support chained
		 * symbolic references. yet.
		 */
		if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0)
			goto cleanup;

38
		if ((error = git_reference_create(
39 40
			&target,
			repo,
41
			git_reference_symbolic_target(head),
42 43 44
			git_object_id(commit), 0)) < 0)
				goto cleanup;
	} else {
45
		if ((error = git_reference_set_target(head, git_object_id(commit))) < 0)
46 47 48 49 50 51 52 53 54 55 56
			goto cleanup;
	}

	error = 0;

cleanup:
	git_reference_free(head);
	git_reference_free(target);
	return error;
}

nulltoken committed
57 58
int git_reset(
	git_repository *repo,
59
	git_object *target,
Russell Belfer committed
60
	git_reset_t reset_type)
nulltoken committed
61 62 63 64
{
	git_object *commit = NULL;
	git_index *index = NULL;
	git_tree *tree = NULL;
65
	int error = 0;
66
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
nulltoken committed
67 68 69

	assert(repo && target);

70 71 72 73 74
	if (git_object_owner(target) != repo) {
		giterr_set(GITERR_OBJECT,
			"%s - The given target does not belong to this repository.", ERROR_MSG);
		return -1;
	}
nulltoken committed
75

76 77
	if (reset_type != GIT_RESET_SOFT &&
		(error = git_repository__ensure_not_bare(repo,
78
			reset_type == GIT_RESET_MIXED ? "reset mixed" : "reset hard")) < 0)
79
		return error;
nulltoken committed
80

81 82 83
	if ((error = git_object_peel(&commit, target, GIT_OBJ_COMMIT)) < 0 ||
		(error = git_repository_index(&index, repo)) < 0 ||
		(error = git_commit_tree(&tree, (git_commit *)commit)) < 0)
Edward Thomson committed
84 85
		goto cleanup;

86
	if (reset_type == GIT_RESET_SOFT &&
87
		(git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE ||
88 89 90 91
		 git_index_has_conflicts(index)))
	{
		giterr_set(GITERR_OBJECT, "%s (soft) in the middle of a merge.", ERROR_MSG);
		error = GIT_EUNMERGED;
nulltoken committed
92 93 94
		goto cleanup;
	}

95 96
	/* move HEAD to the new target */
	if ((error = update_head(repo, commit)) < 0)
nulltoken committed
97 98
		goto cleanup;

99 100 101
	if (reset_type == GIT_RESET_HARD) {
		/* overwrite working directory with HEAD */
		opts.checkout_strategy = GIT_CHECKOUT_FORCE;
nulltoken committed
102

103 104
		if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0)
			goto cleanup;
Edward Thomson committed
105 106
	}

107 108
	if (reset_type > GIT_RESET_SOFT) {
		/* reset index to the target content */
109

nulltoken committed
110
		if ((error = git_index_read_tree(index, tree)) < 0 ||
111 112
			(error = git_index_write(index)) < 0)
			goto cleanup;
113

114 115 116 117 118
		if ((error = git_repository_merge_cleanup(repo)) < 0) {
			giterr_set(GITERR_INDEX, "%s - failed to clean up merge data", ERROR_MSG);
			goto cleanup;
		}
	}
nulltoken committed
119 120

cleanup:
121
	git_object_free(commit);
nulltoken committed
122 123 124 125 126
	git_index_free(index);
	git_tree_free(tree);

	return error;
}