thodg/libgit2/tests/reset/mixed.c

• Show log

  Commit

• Hash : 23a17803
  Author :
  Date : 2015-01-07T14:16:50
  

  reset: remove reflog message override This function is meant to simulate what git does in the reset command, so we should include the reflog message in that.

Download

• tests/reset/mixed.c

• #include "clar_libgit2.h"
  #include "posix.h"
  #include "reset_helpers.h"
  #include "path.h"
  
  static git_repository *repo;
  static git_object *target;
  
  void test_reset_mixed__initialize(void)
  {
  	repo = cl_git_sandbox_init("attr");
  	target = NULL;
  }
  
  void test_reset_mixed__cleanup(void)
  {
  	git_object_free(target);
  	target = NULL;
  
  	cl_git_sandbox_cleanup();
  }
  
  void test_reset_mixed__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);
  
  	cl_git_pass(git_revparse_single(&target, bare, KNOWN_COMMIT_IN_BARE_REPO));
  
  	cl_assert_equal_i(GIT_EBAREREPO, git_reset(bare, target, GIT_RESET_MIXED, NULL));
  
  	git_repository_free(bare);
  }
  
  void test_reset_mixed__resetting_refreshes_the_index_to_the_commit_tree(void)
  {
  	unsigned int status;
  
  	cl_git_pass(git_status_file(&status, repo, "macro_bad"));
  	cl_assert(status == GIT_STATUS_CURRENT);
  	cl_git_pass(git_revparse_single(&target, repo, "605812a"));
  
  	cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL));
  
  	cl_git_pass(git_status_file(&status, repo, "macro_bad"));
  	cl_assert(status == GIT_STATUS_WT_NEW);
  }
  
  void test_reset_mixed__reflog_is_correct(void)
  {
  	git_buf buf = GIT_BUF_INIT;
  	const char *exp_msg = "commit: Updating test data so we can test inter-hunk-context";
  
  	reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg);
  	reflog_check(repo, "refs/heads/master", 9, "yoram.harmelin@gmail.com", exp_msg);
  
  	/* Branch not moving, no reflog entry */
  	cl_git_pass(git_revparse_single(&target, repo, "HEAD^{commit}"));
  	cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL));
  	reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg);
  	reflog_check(repo, "refs/heads/master", 9, "yoram.harmelin@gmail.com", exp_msg);
  
  	git_object_free(target);
  	target = NULL;
  
  	/* Moved branch, expect default message */
  	cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
  	git_buf_clear(&buf);
  	cl_git_pass(git_buf_printf(&buf, "reset: moving to %s", git_oid_tostr_s(git_object_id(target))));
  	cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL));
  	reflog_check(repo, "HEAD", 10, NULL, git_buf_cstr(&buf));
  	reflog_check(repo, "refs/heads/master", 10, NULL, git_buf_cstr(&buf));
  }
  

Download