summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorEtienne Samson <samson.etienne@gmail.com>2018-03-26 18:44:13 +0000
committerEtienne Samson <samson.etienne@gmail.com>2018-03-26 21:02:16 +0200
commitcdd0bc2f878cc169b0c879f95156d6c356be07ba (patch)
tree72ffeb7ec464ad4fb77976e5820ed2c4a5d6326d /include/git2
parent7bd129e4ecc98f2ed219cec6c13b2e9630c8801c (diff)
downloadlibgit2-cdd0bc2f878cc169b0c879f95156d6c356be07ba.tar.gz
checkout: change default strategy to SAFE
As per #4200, our default is quite surprising to users that expect checkout to just "do the thing".
Diffstat (limited to 'include/git2')
-rw-r--r--include/git2/checkout.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h
index 4a9dbb021..c7b0c83ef 100644
--- a/include/git2/checkout.h
+++ b/include/git2/checkout.h
@@ -251,7 +251,7 @@ typedef void (*git_checkout_perfdata_cb)(
typedef struct git_checkout_options {
unsigned int version;
- unsigned int checkout_strategy; /**< default will be a dry run */
+ unsigned int checkout_strategy; /**< default will be a safe checkout */
int disable_filters; /**< don't apply filters like CRLF conversion */
unsigned int dir_mode; /**< default is 0755 */
@@ -295,7 +295,7 @@ typedef struct git_checkout_options {
} git_checkout_options;
#define GIT_CHECKOUT_OPTIONS_VERSION 1
-#define GIT_CHECKOUT_OPTIONS_INIT {GIT_CHECKOUT_OPTIONS_VERSION}
+#define GIT_CHECKOUT_OPTIONS_INIT {GIT_CHECKOUT_OPTIONS_VERSION, GIT_CHECKOUT_SAFE}
/**
* Initializes a `git_checkout_options` with default values. Equivalent to