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/rebase.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/rebase.c')
| -rw-r--r-- | src/rebase.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/rebase.c b/src/rebase.c index 3be751254..f1cb22f3f 100644 --- a/src/rebase.c +++ b/src/rebase.c @@ -275,9 +275,6 @@ static int rebase_alloc(git_rebase **out, const git_rebase_options *rebase_opts) GITERR_CHECK_ALLOC(rebase->options.rewrite_notes_ref); } - if ((rebase->options.checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0) - rebase->options.checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - *out = rebase; return 0; |