diff options
| author | Russell Belfer <rb@github.com> | 2012-11-09 05:05:07 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-10 01:52:07 +0400 |
| commit | ad9a921b92a964a0f28a5f0d59079cde5a0ada1e (patch) | |
| tree | 218caac93e8acd2686521974ce77d165386c4e4b /src/reset.c | |
| parent | 55cbd05b18960e761a4d237ce5f1ff06455da98d (diff) | |
Rework checkout with new strategy options
This is a major reworking of checkout strategy options. The
checkout code is now sensitive to the contents of the HEAD tree
and the new options allow you to update the working tree so that
it will match the index content only when it previously matched
the contents of the HEAD. This allows you to, for example, to
distinguish between removing files that are in the HEAD but not
in the index, vs just removing all untracked files.
Because of various corner cases that arise, etc., this required
some additional capabilities in rmdir and other utility functions.
This includes the beginnings of an implementation of code to read
a partial tree into the index based on a pathspec, but that is
not enabled because of the possibility of creating conflicting
index entries.
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/reset.c b/src/reset.c index 7df1c1a57..69a9c4f04 100644 --- a/src/reset.c +++ b/src/reset.c @@ -137,10 +137,7 @@ int git_reset( } memset(&opts, 0, sizeof(opts)); - opts.checkout_strategy = - GIT_CHECKOUT_CREATE_MISSING - | GIT_CHECKOUT_OVERWRITE_MODIFIED - | GIT_CHECKOUT_REMOVE_UNTRACKED; + opts.checkout_strategy = GIT_CHECKOUT_FORCE; if (git_checkout_index(repo, &opts) < 0) { giterr_set(GITERR_INDEX, "%s - Failed to checkout the index.", ERROR_MSG); |