From 094cfc2904bab0d6ec52f16cb677b3b0ebbc7621 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sat, 14 Feb 2015 10:03:29 -0500 Subject: [PATCH] cherrypick, revert: drop unnecessary SAFE_CREATE --- src/cherrypick.c | 2 +- src/revert.c | 2 +- 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);