Commit ee8bb8ba649118c4abb09cb02bd3c02e60b98e06
2012-08-19T21:24:51
reset: add support for GIT_RESET_HARD mode
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118
diff --git a/include/git2/reset.h b/include/git2/reset.h
index cd263fa..cdcfb76 100644
--- a/include/git2/reset.h
+++ b/include/git2/reset.h
@@ -24,6 +24,9 @@ GIT_BEGIN_DECL
* Specifying a Mixed kind of reset will trigger a Soft reset and the index will
* be replaced with the content of the commit tree.
*
+ * Specifying a Hard kind of reset will trigger a Mixed reset and the working
+ * directory will be replaced with the content of the index.
+ *
* TODO: Implement remaining kinds of resets.
*
* @param repo Repository where to perform the reset operation.
diff --git a/include/git2/types.h b/include/git2/types.h
index d3a9053..26e9c57 100644
--- a/include/git2/types.h
+++ b/include/git2/types.h
@@ -173,6 +173,7 @@ typedef enum {
typedef enum {
GIT_RESET_SOFT = 1,
GIT_RESET_MIXED = 2,
+ GIT_RESET_HARD = 3,
} git_reset_type;
/** Valid modes for index and tree entries. */
diff --git a/src/reset.c b/src/reset.c
index 5aaf948..efe3b6b 100644
--- a/src/reset.c
+++ b/src/reset.c
@@ -9,6 +9,7 @@
#include "commit.h"
#include "tag.h"
#include "git2/reset.h"
+#include "git2/checkout.h"
#define ERROR_MSG "Cannot perform reset"
@@ -29,7 +30,9 @@ int git_reset(
int error = -1;
assert(repo && target);
- assert(reset_type == GIT_RESET_SOFT || reset_type == GIT_RESET_MIXED);
+ assert(reset_type == GIT_RESET_SOFT
+ || reset_type == GIT_RESET_MIXED
+ || reset_type == GIT_RESET_HARD);
if (git_object_owner(target) != repo)
return reset_error_invalid("The given target does not belong to this repository.");
@@ -73,6 +76,16 @@ int git_reset(
goto cleanup;
}
+ if (reset_type == GIT_RESET_MIXED) {
+ error = 0;
+ goto cleanup;
+ }
+
+ if (git_checkout_index(repo, NULL, NULL, NULL) < 0) {
+ giterr_set(GITERR_INDEX, "%s - Failed to checkout the index.", ERROR_MSG);
+ goto cleanup;
+ }
+
error = 0;
cleanup:
diff --git a/tests-clar/reset/hard.c b/tests-clar/reset/hard.c
new file mode 100644
index 0000000..ad3badb
--- /dev/null
+++ b/tests-clar/reset/hard.c
@@ -0,0 +1,46 @@
+#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);
+ cl_git_sandbox_cleanup();
+}
+
+void test_reset_hard__resetting_culls_empty_directories(void)
+{
+ git_buf subdir_path = GIT_BUF_INIT;
+ git_buf subfile_path = GIT_BUF_INIT;
+ git_buf newdir_path = GIT_BUF_INIT;
+
+ cl_git_pass(git_buf_joinpath(&newdir_path, git_repository_workdir(repo), "newdir/"));
+
+ cl_git_pass(git_buf_joinpath(&subfile_path, git_buf_cstr(&newdir_path), "with/nested/file.txt"));
+ cl_git_pass(git_futils_mkpath2file(git_buf_cstr(&subfile_path), 0755));
+ cl_git_mkfile(git_buf_cstr(&subfile_path), "all anew...\n");
+
+ cl_git_pass(git_buf_joinpath(&subdir_path, git_repository_workdir(repo), "subdir/"));
+ cl_assert(git_path_isdir(git_buf_cstr(&subdir_path)) == true);
+
+ retrieve_target_from_oid(&target, repo, "0017bd4ab1ec30440b17bae1680cff124ab5f1f6");
+ cl_git_pass(git_reset(repo, target, GIT_RESET_HARD));
+
+ cl_assert(git_path_isdir(git_buf_cstr(&subdir_path)) == false);
+ cl_assert(git_path_isdir(git_buf_cstr(&newdir_path)) == false);
+
+ git_buf_free(&subdir_path);
+ git_buf_free(&subfile_path);
+ git_buf_free(&newdir_path);
+}