mirror of
https://git.proxmox.com/git/libgit2
synced 2025-06-20 13:41:23 +00:00
cherrypick, revert: drop unnecessary SAFE_CREATE
This commit is contained in:
parent
366e53d3da
commit
094cfc2904
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user