proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-30 00:04:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stash apply: default to at least GIT_CHECKOUT_SAFE

Browse Source
This commit is contained in:
Edward Thomson 2015-04-20 20:05:23 -04:00
parent f78bb2afb3
commit 12149a20ef
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/git2/stash.h
View File

@ -96,7 +96,9 @@ typedef enum {
* @param repo The owning repository. * @param repo The owning repository.
* @param index The position within the stash list. 0 points to the * @param index The position within the stash list. 0 points to the
* most recent stashed state. * most recent stashed state.
* @param checkout_options Options to control how files are checked out * @param checkout_options Options to control how files are checked out.
* A minimum strategy of `GIT_CHECKOUT_SAFE` is
* implied.
* @param flags Flags to control the applying process. (see GIT_APPLY_* above) * @param flags Flags to control the applying process. (see GIT_APPLY_* above)
* *
* @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the * @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the

5
src/stash.c
View File

@ -681,11 +681,12 @@ static void normalize_checkout_options(
memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options)); memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options));
} else { } else {
git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options)); memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options));
} }
if ((checkout_opts->checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0)
checkout_opts->checkout_strategy = GIT_CHECKOUT_SAFE;
if (!checkout_opts->our_label) if (!checkout_opts->our_label)
checkout_opts->our_label = "Updated upstream"; checkout_opts->our_label = "Updated upstream";