summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2015-02-14 10:03:29 -0500
committerEdward Thomson <ethomson@microsoft.com>2015-02-27 13:47:30 -0500
commit094cfc2904bab0d6ec52f16cb677b3b0ebbc7621 (patch)
tree3e70f15d769c5b2016ec09b07436fd0f38992853 /src
parent366e53d3da72805a3db1a1e77d4666416fcb5a93 (diff)
downloadlibgit2-094cfc2904bab0d6ec52f16cb677b3b0ebbc7621.tar.gz
cherrypick, revert: drop unnecessary SAFE_CREATE
Diffstat (limited to 'src')
-rw-r--r--src/cherrypick.c2
-rw-r--r--src/revert.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cherrypick.c b/src/cherrypick.c
index ebc9fcdd8..c92975194 100644
--- 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);
diff --git a/src/revert.c b/src/revert.c
index f8a7f4333..c481e7dea 100644
--- 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);