diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-09-06 15:15:46 +0200 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-09-17 10:48:30 +0200 |
| commit | c214fa1caff937f20ca3a388652352cda92ce85b (patch) | |
| tree | 95e4b878cb2d0aeb13e18a830b192f0b366c9246 /src | |
| parent | 020cda99c2bec386cb10200f6cfe1b150911ffc9 (diff) | |
| download | libgit2-c214fa1caff937f20ca3a388652352cda92ce85b.tar.gz | |
checkout: segregate checkout strategies
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 24 | ||||
| -rw-r--r-- | src/reset.c | 9 |
2 files changed, 28 insertions, 5 deletions
diff --git a/src/checkout.c b/src/checkout.c index 6e34e50ab..beb8b5a63 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -143,6 +143,9 @@ static int checkout_diff_fn( switch (delta->status) { case GIT_DELTA_UNTRACKED: + if (!(data->checkout_opts->checkout_strategy & GIT_CHECKOUT_REMOVE_UNTRACKED)) + return 0; + if (!git__suffixcmp(delta->new_file.path, "/")) error = git_futils_rmdir_r(git_buf_cstr(data->path), GIT_DIRREMOVAL_FILES_AND_DIRS); else @@ -150,11 +153,24 @@ static int checkout_diff_fn( break; case GIT_DELTA_MODIFIED: - /* Deal with pre-existing files */ - if (data->checkout_opts->existing_file_action == GIT_CHECKOUT_SKIP_EXISTING) + if (!(data->checkout_opts->checkout_strategy & GIT_CHECKOUT_OVERWRITE_MODIFIED)) return 0; + if (checkout_blob( + data->owner, + &delta->old_file.oid, + git_buf_cstr(data->path), + delta->old_file.mode, + data->can_symlink, + data->checkout_opts) < 0) + goto cleanup; + + break; + case GIT_DELTA_DELETED: + if (!(data->checkout_opts->checkout_strategy & GIT_CHECKOUT_CREATE_MISSING)) + return 0; + if (checkout_blob( data->owner, &delta->old_file.oid, @@ -209,8 +225,8 @@ static void normalize_options(git_checkout_opts *normalized, git_checkout_opts * memmove(normalized, proposed, sizeof(git_checkout_opts)); /* Default options */ - if (!normalized->existing_file_action) - normalized->existing_file_action = GIT_CHECKOUT_OVERWRITE_EXISTING; + if (!normalized->checkout_strategy) + normalized->checkout_strategy = GIT_CHECKOUT_DEFAULT; /* opts->disable_filters is false by default */ if (!normalized->dir_mode) diff --git a/src/reset.c b/src/reset.c index efe3b6be9..4ce21e2cf 100644 --- a/src/reset.c +++ b/src/reset.c @@ -28,6 +28,7 @@ int git_reset( git_index *index = NULL; git_tree *tree = NULL; int error = -1; + git_checkout_opts opts; assert(repo && target); assert(reset_type == GIT_RESET_SOFT @@ -81,7 +82,13 @@ int git_reset( goto cleanup; } - if (git_checkout_index(repo, NULL, NULL, NULL) < 0) { + memset(&opts, 0, sizeof(opts)); + opts.checkout_strategy = + GIT_CHECKOUT_CREATE_MISSING + | GIT_CHECKOUT_OVERWRITE_MODIFIED + | GIT_CHECKOUT_REMOVE_UNTRACKED; + + if (git_checkout_index(repo, &opts, NULL) < 0) { giterr_set(GITERR_INDEX, "%s - Failed to checkout the index.", ERROR_MSG); goto cleanup; } |