soft.c 4.61 KB
Newer Older
nulltoken committed
1
#include "clar_libgit2.h"
Edward Thomson committed
2
#include "posix.h"
nulltoken committed
3
#include "reset_helpers.h"
Edward Thomson committed
4
#include "path.h"
5
#include "repo/repo_helpers.h"
nulltoken committed
6 7 8 9 10 11 12 13 14 15 16 17

static git_repository *repo;
static git_object *target;

void test_reset_soft__initialize(void)
{
	repo = cl_git_sandbox_init("testrepo.git");
}

void test_reset_soft__cleanup(void)
{
	git_object_free(target);
18 19
	target = NULL;

nulltoken committed
20 21 22 23 24 25 26
	cl_git_sandbox_cleanup();
}

static void assert_reset_soft(bool should_be_detached)
{
	git_oid oid;

27
	cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD"));
nulltoken committed
28 29 30 31 32 33 34 35 36 37
	cl_git_fail(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO));

	retrieve_target_from_oid(&target, repo, KNOWN_COMMIT_IN_BARE_REPO);

	cl_assert(git_repository_head_detached(repo) == should_be_detached);

	cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT));

	cl_assert(git_repository_head_detached(repo) == should_be_detached);

38
	cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD"));
nulltoken committed
39 40 41 42 43 44 45 46 47 48
	cl_git_pass(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO));
}

void test_reset_soft__can_reset_the_non_detached_Head_to_the_specified_commit(void)
{
	assert_reset_soft(false);
}

void test_reset_soft__can_reset_the_detached_Head_to_the_specified_commit(void)
{
49
	git_repository_detach_head(repo);
nulltoken committed
50 51 52 53 54 55 56 57 58

	assert_reset_soft(true);
}

void test_reset_soft__resetting_to_the_commit_pointed_at_by_the_Head_does_not_change_the_target_of_the_Head(void)
{
	git_oid oid;
	char raw_head_oid[GIT_OID_HEXSZ + 1];

59
	cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD"));
nulltoken committed
60 61 62 63 64 65 66
	git_oid_fmt(raw_head_oid, &oid);
	raw_head_oid[GIT_OID_HEXSZ] = '\0';

	retrieve_target_from_oid(&target, repo, raw_head_oid);

	cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT));

67
	cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD"));
nulltoken committed
68 69 70 71 72 73 74 75 76 77 78 79 80
	cl_git_pass(git_oid_streq(&oid, raw_head_oid));
}

void test_reset_soft__resetting_to_a_tag_sets_the_Head_to_the_peeled_commit(void)
{
	git_oid oid;

	/* b25fa35 is a tag, pointing to another tag which points to commit e90810b */
	retrieve_target_from_oid(&target, repo, "b25fa35b38051e4ae45d4222e795f9df2e43f1d1");

	cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT));

	cl_assert(git_repository_head_detached(repo) == false);
81
	cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD"));
nulltoken committed
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
	cl_git_pass(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO));
}

void test_reset_soft__cannot_reset_to_a_tag_not_pointing_at_a_commit(void)
{
	/* 53fc32d is the tree of commit e90810b */
	retrieve_target_from_oid(&target, repo, "53fc32d17276939fc79ed05badaef2db09990016");

	cl_git_fail(git_reset(repo, target, GIT_RESET_SOFT));
	git_object_free(target);

	/* 521d87c is an annotated tag pointing to a blob */
	retrieve_target_from_oid(&target, repo, "521d87c1ec3aef9824daf6d96cc0ae3710766d91");
	cl_git_fail(git_reset(repo, target, GIT_RESET_SOFT));
}
97

98
void test_reset_soft__resetting_against_an_unborn_head_repo_makes_the_head_no_longer_unborn(void)
99 100 101 102 103
{
	git_reference *head;

	retrieve_target_from_oid(&target, repo, KNOWN_COMMIT_IN_BARE_REPO);

104
	make_head_unborn(repo, NON_EXISTING_HEAD);
105

106
	cl_assert_equal_i(true, git_repository_head_unborn(repo));
107 108 109

	cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT));

110
	cl_assert_equal_i(false, git_repository_head_unborn(repo));
111 112

	cl_git_pass(git_reference_lookup(&head, repo, NON_EXISTING_HEAD));
113
	cl_assert_equal_i(0, git_oid_streq(git_reference_target(head), KNOWN_COMMIT_IN_BARE_REPO));
114 115 116

	git_reference_free(head);
}
Edward Thomson committed
117 118 119 120 121

void test_reset_soft__fails_when_merging(void)
{
	git_buf merge_head_path = GIT_BUF_INIT;

122
	cl_git_pass(git_repository_detach_head(repo));
Edward Thomson committed
123 124 125
	cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD"));
	cl_git_mkfile(git_buf_cstr(&merge_head_path), "beefbeefbeefbeefbeefbeefbeefbeefbeefbeef\n");

Edward Thomson committed
126 127 128
	retrieve_target_from_oid(&target, repo, KNOWN_COMMIT_IN_BARE_REPO);

	cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT));
Edward Thomson committed
129
	cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path)));
nulltoken committed
130 131

	git_buf_free(&merge_head_path);
Edward Thomson committed
132
}
133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157

void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE_HEAD_file_existence(void)
{
	git_index *index;
	git_reference *head;
	git_buf merge_head_path = GIT_BUF_INIT;

	cl_git_sandbox_cleanup();

	repo = cl_git_sandbox_init("mergedrepo");

	cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD"));
	cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path)));
	git_buf_free(&merge_head_path);

	cl_git_pass(git_repository_index(&index, repo));
	cl_assert_equal_i(true, git_index_has_conflicts(index));
	git_index_free(index);

	cl_git_pass(git_repository_head(&head, repo));
	cl_git_pass(git_reference_peel(&target, head, GIT_OBJ_COMMIT));
	git_reference_free(head);

	cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT));
}