mirror of
				https://git.proxmox.com/git/libgit2
				synced 2025-10-31 17:50:41 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			201 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			201 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "clar_libgit2.h"
 | |
| #include "posix.h"
 | |
| #include "reset_helpers.h"
 | |
| #include "path.h"
 | |
| #include "fileops.h"
 | |
| 
 | |
| static git_repository *repo;
 | |
| static git_object *target;
 | |
| 
 | |
| void test_reset_hard__initialize(void)
 | |
| {
 | |
| 	repo = cl_git_sandbox_init("status");
 | |
| 	target = NULL;
 | |
| }
 | |
| 
 | |
| void test_reset_hard__cleanup(void)
 | |
| {
 | |
| 	if (target != NULL) {
 | |
| 		git_object_free(target);
 | |
| 		target = NULL;
 | |
| 	}
 | |
| 
 | |
| 	cl_git_sandbox_cleanup();
 | |
| }
 | |
| 
 | |
| static int strequal_ignore_eol(const char *exp, const char *str)
 | |
| {
 | |
| 	while (*exp && *str) {
 | |
| 		if (*exp != *str) {
 | |
| 			while (*exp == '\r' || *exp == '\n') ++exp;
 | |
| 			while (*str == '\r' || *str == '\n') ++str;
 | |
| 			if (*exp != *str)
 | |
| 				return false;
 | |
| 		} else {
 | |
| 			exp++; str++;
 | |
| 		}
 | |
| 	}
 | |
| 	return (!*exp && !*str);
 | |
| }
 | |
| 
 | |
| void test_reset_hard__resetting_reverts_modified_files(void)
 | |
| {
 | |
| 	git_buf path = GIT_BUF_INIT, content = GIT_BUF_INIT;
 | |
| 	int i;
 | |
| 	static const char *files[4] = {
 | |
| 		"current_file",
 | |
| 		"modified_file",
 | |
| 		"staged_new_file",
 | |
| 		"staged_changes_modified_file" };
 | |
| 	static const char *before[4] = {
 | |
| 		"current_file\n",
 | |
| 		"modified_file\nmodified_file\n",
 | |
| 		"staged_new_file\n",
 | |
| 		"staged_changes_modified_file\nstaged_changes_modified_file\nstaged_changes_modified_file\n"
 | |
| 	};
 | |
| 	static const char *after[4] = {
 | |
| 		"current_file\n",
 | |
| 		"modified_file\n",
 | |
| 		NULL,
 | |
| 		"staged_changes_modified_file\n"
 | |
| 	};
 | |
| 	const char *wd = git_repository_workdir(repo);
 | |
| 
 | |
| 	cl_assert(wd);
 | |
| 
 | |
| 	for (i = 0; i < 4; ++i) {
 | |
| 		cl_git_pass(git_buf_joinpath(&path, wd, files[i]));
 | |
| 		cl_git_pass(git_futils_readbuffer(&content, path.ptr));
 | |
| 		cl_assert_equal_s(before[i], content.ptr);
 | |
| 	}
 | |
| 
 | |
| 	retrieve_target_from_oid(
 | |
| 		&target, repo, "26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f");
 | |
| 
 | |
| 	cl_git_pass(git_reset(repo, target, GIT_RESET_HARD));
 | |
| 
 | |
| 	for (i = 0; i < 4; ++i) {
 | |
| 		cl_git_pass(git_buf_joinpath(&path, wd, files[i]));
 | |
| 		if (after[i]) {
 | |
| 			cl_git_pass(git_futils_readbuffer(&content, path.ptr));
 | |
| 			cl_assert(strequal_ignore_eol(after[i], content.ptr));
 | |
| 		} else {
 | |
| 			cl_assert(!git_path_exists(path.ptr));
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	git_buf_free(&content);
 | |
| 	git_buf_free(&path);
 | |
| }
 | |
| 
 | |
| void test_reset_hard__cannot_reset_in_a_bare_repository(void)
 | |
| {
 | |
| 	git_repository *bare;
 | |
| 
 | |
| 	cl_git_pass(git_repository_open(&bare, cl_fixture("testrepo.git")));
 | |
| 	cl_assert(git_repository_is_bare(bare) == true);
 | |
| 
 | |
| 	retrieve_target_from_oid(&target, bare, KNOWN_COMMIT_IN_BARE_REPO);
 | |
| 
 | |
| 	cl_assert_equal_i(GIT_EBAREREPO, git_reset(bare, target, GIT_RESET_HARD));
 | |
| 
 | |
| 	git_repository_free(bare);
 | |
| }
 | |
| 
 | |
| static void index_entry_init(git_index *index, int side, git_oid *oid)
 | |
| {
 | |
| 	git_index_entry entry;
 | |
| 
 | |
| 	memset(&entry, 0x0, sizeof(git_index_entry));
 | |
| 
 | |
| 	entry.path = "conflicting_file";
 | |
| 	entry.flags = (side << GIT_IDXENTRY_STAGESHIFT);
 | |
| 	entry.mode = 0100644;
 | |
| 	git_oid_cpy(&entry.oid, oid);
 | |
| 
 | |
| 	cl_git_pass(git_index_add(index, &entry));
 | |
| }
 | |
| 
 | |
| static void unmerged_index_init(git_index *index, int entries)
 | |
| {
 | |
| 	int write_ancestor = 1;
 | |
| 	int write_ours = 2;
 | |
| 	int write_theirs = 4;
 | |
| 	git_oid ancestor, ours, theirs;
 | |
| 
 | |
| 	git_oid_fromstr(&ancestor, "6bb0d9f700543ba3d318ba7075fc3bd696b4287b");
 | |
| 	git_oid_fromstr(&ours, "b19a1e93bec1317dc6097229e12afaffbfa74dc2");
 | |
| 	git_oid_fromstr(&theirs, "950b81b7eee953d050aa05a641f8e056c85dd1bd");
 | |
| 
 | |
| 	cl_git_rewritefile("status/conflicting_file", "conflicting file\n");
 | |
| 
 | |
| 	if (entries & write_ancestor)
 | |
| 		index_entry_init(index, 1, &ancestor);
 | |
| 
 | |
| 	if (entries & write_ours)
 | |
| 		index_entry_init(index, 2, &ours);
 | |
| 
 | |
| 	if (entries & write_theirs)
 | |
| 		index_entry_init(index, 3, &theirs);
 | |
| }
 | |
| 
 | |
| void test_reset_hard__resetting_reverts_unmerged(void)
 | |
| {
 | |
| 	git_index *index;
 | |
| 	int entries;
 | |
| 
 | |
| 	/* Ensure every permutation of non-zero stage entries results in the
 | |
| 	 * path being cleaned up. */
 | |
| 	for (entries = 1; entries < 8; entries++) {
 | |
| 		cl_git_pass(git_repository_index(&index, repo));
 | |
| 
 | |
| 		unmerged_index_init(index, entries);
 | |
| 		cl_git_pass(git_index_write(index));
 | |
| 
 | |
| 		retrieve_target_from_oid(&target, repo, "26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f");
 | |
| 		cl_git_pass(git_reset(repo, target, GIT_RESET_HARD));
 | |
| 
 | |
| 		cl_assert(git_path_exists("status/conflicting_file") == 0);
 | |
| 
 | |
| 		git_object_free(target);
 | |
| 		target = NULL;
 | |
| 
 | |
| 		git_index_free(index);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| void test_reset_hard__cleans_up_merge(void)
 | |
| {
 | |
| 	git_buf merge_head_path = GIT_BUF_INIT,
 | |
| 		merge_msg_path = GIT_BUF_INIT,
 | |
| 		merge_mode_path = GIT_BUF_INIT,
 | |
| 		orig_head_path = GIT_BUF_INIT;
 | |
| 
 | |
| 	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");
 | |
| 
 | |
| 	cl_git_pass(git_buf_joinpath(&merge_msg_path, git_repository_path(repo), "MERGE_MSG"));
 | |
| 	cl_git_mkfile(git_buf_cstr(&merge_msg_path), "Merge commit 0017bd4ab1ec30440b17bae1680cff124ab5f1f6\n");
 | |
| 
 | |
| 	cl_git_pass(git_buf_joinpath(&merge_mode_path, git_repository_path(repo), "MERGE_MODE"));
 | |
| 	cl_git_mkfile(git_buf_cstr(&merge_mode_path), "");
 | |
| 
 | |
| 	cl_git_pass(git_buf_joinpath(&orig_head_path, git_repository_path(repo), "ORIG_HEAD"));
 | |
| 	cl_git_mkfile(git_buf_cstr(&orig_head_path), "0017bd4ab1ec30440b17bae1680cff124ab5f1f6");
 | |
| 
 | |
| 	retrieve_target_from_oid(&target, repo, "0017bd4ab1ec30440b17bae1680cff124ab5f1f6");
 | |
| 	cl_git_pass(git_reset(repo, target, GIT_RESET_HARD));
 | |
| 
 | |
| 	cl_assert(!git_path_exists(git_buf_cstr(&merge_head_path)));
 | |
| 	cl_assert(!git_path_exists(git_buf_cstr(&merge_msg_path)));
 | |
| 	cl_assert(!git_path_exists(git_buf_cstr(&merge_mode_path)));
 | |
| 
 | |
| 	cl_assert(git_path_exists(git_buf_cstr(&orig_head_path)));
 | |
| 	cl_git_pass(p_unlink(git_buf_cstr(&orig_head_path)));
 | |
| 
 | |
| 	git_buf_free(&merge_head_path);
 | |
| 	git_buf_free(&merge_msg_path);
 | |
| 	git_buf_free(&merge_mode_path);
 | |
| 	git_buf_free(&orig_head_path);
 | |
| }
 | 
