diff options
| author | Etienne Samson <samson.etienne@gmail.com> | 2018-03-26 18:44:13 +0000 |
|---|---|---|
| committer | Etienne Samson <samson.etienne@gmail.com> | 2018-03-26 21:02:16 +0200 |
| commit | cdd0bc2f878cc169b0c879f95156d6c356be07ba (patch) | |
| tree | 72ffeb7ec464ad4fb77976e5820ed2c4a5d6326d /src/stash.c | |
| parent | 7bd129e4ecc98f2ed219cec6c13b2e9630c8801c (diff) | |
| download | libgit2-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 'src/stash.c')
| -rw-r--r-- | src/stash.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/stash.c b/src/stash.c index 8a8c57a83..4b7e92af2 100644 --- a/src/stash.c +++ b/src/stash.c @@ -738,9 +738,6 @@ static void normalize_apply_options( memcpy(opts, &default_apply_opts, sizeof(git_stash_apply_options)); } - if ((opts->checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0) - opts->checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - if (!opts->checkout_options.our_label) opts->checkout_options.our_label = "Updated upstream"; |