Commit 2461e0d20f46b6cfaf222759aca4a993ddc7b215

Pierre-Olivier Latour 2015-03-08T14:10:02

Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARD

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/src/reset.c b/src/reset.c
index f42a0b3..351ecaa 100644
--- a/src/reset.c
+++ b/src/reset.c
@@ -149,7 +149,7 @@ int git_reset(
 
 	if (reset_type == GIT_RESET_HARD) {
 		/* overwrite working directory with HEAD */
-		opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_SKIP_UNMERGED;
+		opts.checkout_strategy = GIT_CHECKOUT_FORCE;
 
 		if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0)
 			goto cleanup;