Merge https://salsa.debian.org/debian/libgit2 into proxmox/bullseye

[libgit2.git] / tests / libgit2 / reset / mixed.c

diff --git a/tests/libgit2/reset/mixed.c b/tests/libgit2/reset/mixed.c
new file mode 100644 (file)
index 0000000..4a78d4c
--- /dev/null
+++ b/tests/libgit2/reset/mixed.c
@@ -0,0 +1,85 @@
+#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);
+}