thodg/libgit2/tests/reset/mixed.c

• Show log

  Commit

• Hash : f0e693b1
  Author :
  Date : 2021-09-07T17:53:49
  

  str: introduce `git_str` for internal, `git_buf` is external libgit2 has two distinct requirements that were previously solved by `git_buf`. We require: 1. A general purpose string class that provides a number of utility APIs for manipulating data (eg, concatenating, truncating, etc). 2. A structure that we can use to return strings to callers that they can take ownership of. By using a single class (`git_buf`) for both of these purposes, we have confused the API to the point that refactorings are difficult and reasoning about correctness is also difficult. Move the utility class `git_buf` to be called `git_str`: this represents its general purpose, as an internal string buffer class. The name also is an homage to Junio Hamano ("gitstr"). The public API remains `git_buf`, and has a much smaller footprint. It is generally only used as an "out" param with strict requirements that follow the documentation. (Exceptions exist for some legacy APIs to avoid breaking callers unnecessarily.) Utility functions exist to convert a user-specified `git_buf` to a `git_str` so that we can call internal functions, then converting it back again.

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_str buf = GIT_STR_INIT;
  	git_annotated_commit *annotated;
  	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 id in message */
  	cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
  	git_str_clear(&buf);
  	cl_git_pass(git_str_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_str_cstr(&buf));
  	reflog_check(repo, "refs/heads/master", 10, NULL, git_str_cstr(&buf));
  	git_str_dispose(&buf);
  
  	/* Moved branch, expect revspec in message */
  	exp_msg = "reset: moving to HEAD~^{commit}";
  	cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}"));
  	cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_MIXED, NULL));
  	reflog_check(repo, "HEAD", 11, NULL, exp_msg);
  	reflog_check(repo, "refs/heads/master", 11, NULL, exp_msg);
  	git_annotated_commit_free(annotated);
  }
  

Download