thodg/libgit2/tests-clar/reset/hard.c

• Show log

  Commit

• Hash : 9094d30b
  Author :
  Date : 2012-11-23T11:41:56
  

  Reset all static variables to NULL in clar's __cleanup Without this change, any failed assertion in the second (or a later) test inside a test suite has a chance of double deleting memory, resulting in a heap corruption. See #1096 for details. This leaves alone the test cases where we "just" use cl_git_sandbox_init() and cl_git_sandbox_cleanup(). These methods already take good care to not double delete a repository. Fixes #1096

Download

• tests-clar/reset/hard.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)
  {
  	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",
  		/* wrong value because reset is still slightly incorrect */
  		"staged_new_file\n",
  		/* right value: 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);
  }
  
  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_head_path), "Merge commit 0017bd4ab1ec30440b17bae1680cff124ab5f1f6\n");
  
  	cl_git_pass(git_buf_joinpath(&merge_msg_path, git_repository_path(repo), "MERGE_MODE"));
  	cl_git_mkfile(git_buf_cstr(&merge_head_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);
  }
  

Download