Commit 465c3b38d59548648521fa4cdbd3d8a832059bb6
2015-12-09T19:16:11
reset: perform the checkout before moving HEAD or the index This keeps the state of the workdir the same as one from HEAD, removing a source of possible confusion when calculating the work that is to be done.
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
diff --git a/src/reset.c b/src/reset.c
index 0ffa51b..f8a1a1d 100644
--- a/src/reset.c
+++ b/src/reset.c
@@ -145,19 +145,19 @@ static int reset(
if ((error = git_buf_printf(&log_message, "reset: moving to %s", to)) < 0)
return error;
- /* move HEAD to the new target */
- if ((error = git_reference__update_terminal(repo, GIT_HEAD_FILE,
- git_object_id(commit), NULL, git_buf_cstr(&log_message))) < 0)
- goto cleanup;
-
if (reset_type == GIT_RESET_HARD) {
- /* overwrite working directory with HEAD */
+ /* overwrite working directory with the new tree */
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0)
goto cleanup;
}
+ /* move HEAD to the new target */
+ if ((error = git_reference__update_terminal(repo, GIT_HEAD_FILE,
+ git_object_id(commit), NULL, git_buf_cstr(&log_message))) < 0)
+ goto cleanup;
+
if (reset_type > GIT_RESET_SOFT) {
/* reset index to the target content */
diff --git a/tests/reset/hard.c b/tests/reset/hard.c
index 88055ad..1499733 100644
--- a/tests/reset/hard.c
+++ b/tests/reset/hard.c
@@ -235,3 +235,55 @@ void test_reset_hard__reflog_is_correct(void)
git_annotated_commit_free(annotated);
}
+
+void test_reset_hard__switch_file_to_dir(void)
+{
+ git_index_entry entry = { 0 };
+ git_index *idx;
+ git_object *commit;
+ git_tree *tree;
+ git_signature *sig;
+ git_oid src_tree_id, tgt_tree_id;
+ git_oid src_id, tgt_id;
+
+ entry.mode = GIT_FILEMODE_BLOB;
+ cl_git_pass(git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"));
+ cl_git_pass(git_index_new(&idx));
+ cl_git_pass(git_signature_now(&sig, "foo", "bar"));
+
+ /* Create the old tree */
+ entry.path = "README";
+ cl_git_pass(git_index_add(idx, &entry));
+ entry.path = "dir";
+ cl_git_pass(git_index_add(idx, &entry));
+
+ cl_git_pass(git_index_write_tree_to(&src_tree_id, idx, repo));
+ cl_git_pass(git_index_clear(idx));
+
+ cl_git_pass(git_tree_lookup(&tree, repo, &src_tree_id));
+ cl_git_pass(git_commit_create(&src_id, repo, NULL, sig, sig, NULL, "foo", tree, 0, NULL));
+ git_tree_free(tree);
+
+ /* Create the new tree */
+ entry.path = "README";
+ cl_git_pass(git_index_add(idx, &entry));
+ entry.path = "dir/FILE";
+ cl_git_pass(git_index_add(idx, &entry));
+
+ cl_git_pass(git_index_write_tree_to(&tgt_tree_id, idx, repo));
+ cl_git_pass(git_tree_lookup(&tree, repo, &tgt_tree_id));
+ cl_git_pass(git_commit_create(&tgt_id, repo, NULL, sig, sig, NULL, "foo", tree, 0, NULL));
+ git_tree_free(tree);
+ git_index_free(idx);
+ git_signature_free(sig);
+
+ /* Let's go to a known state of the src commit with the file named 'dir' */
+ cl_git_pass(git_object_lookup(&commit, repo, &src_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL));
+ git_object_free(commit);
+
+ /* And now we move over to the commit with the directory named 'dir' */
+ cl_git_pass(git_object_lookup(&commit, repo, &tgt_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL));
+ git_object_free(commit);
+}