cherrypick, revert: drop unnecessary SAFE_CREATE

This commit is contained in:
Edward Thomson 2015-02-14 10:03:29 -05:00 committed by Edward Thomson
parent 366e53d3da
commit 094cfc2904
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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);