proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-20 22:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cherrypick, revert: drop unnecessary SAFE_CREATE

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cherrypick.c
View File

@ -72,7 +72,7 @@ static int cherrypick_normalize_opts(
const char *their_label) const char *their_label)
{ {
int error = 0; 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_CHECKOUT_ALLOW_CONFLICTS;
GIT_UNUSED(repo); GIT_UNUSED(repo);

2
src/revert.c
View File

@ -73,7 +73,7 @@ static int revert_normalize_opts(
const char *their_label) const char *their_label)
{ {
int error = 0; 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_CHECKOUT_ALLOW_CONFLICTS;
GIT_UNUSED(repo); GIT_UNUSED(repo);