diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-03-27 11:25:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 11:25:20 +0100 |
| commit | 217add94008135035f19a7076ba20de4338d8220 (patch) | |
| tree | 72ffeb7ec464ad4fb77976e5820ed2c4a5d6326d /include | |
| parent | 7bd129e4ecc98f2ed219cec6c13b2e9630c8801c (diff) | |
| parent | cdd0bc2f878cc169b0c879f95156d6c356be07ba (diff) | |
| download | libgit2-217add94008135035f19a7076ba20de4338d8220.tar.gz | |
Merge pull request #4531 from tiennou/fix/checkout-default-safe
checkout: change default strategy to SAFE
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/checkout.h | 4 |
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 |