cherrypick, revert: drop unnecessary SAFE_CREATE

094cfc29 · Edward Thomson · Edward Thomson · 366e53d3 · 094cfc29 · 094cfc29
Commit 094cfc29 authored Feb 14, 2015 by Edward Thomson Committed by Edward Thomson Feb 27, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/cherrypick.c
+1 -1

src/revert.c
+1 -1

No files found.
--- a/src/cherrypick.c
+++ b/src/cherrypick.c
@@ -72,7 +72,7 @@ static int cherrypick_normalize_opts(
 	const char *their_label)
 {
 	int error = 0;
-	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE_CREATE |
+	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE |
 		GIT_CHECKOUT_ALLOW_CONFLICTS;
 	GIT_UNUSED(repo);

--- a/src/revert.c
+++ b/src/revert.c
@@ -73,7 +73,7 @@ static int revert_normalize_opts(
 	const char *their_label)
 {
 	int error = 0;
-	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE_CREATE |
+	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE |
 		GIT_CHECKOUT_ALLOW_CONFLICTS;
 	GIT_UNUSED(repo);