]> git.proxmox.com Git - libgit2.git/commit - include/git2/checkout.h
Rework checkout with new strategy options
authorRussell Belfer <rb@github.com>
Fri, 9 Nov 2012 01:05:07 +0000 (17:05 -0800)
committerRussell Belfer <rb@github.com>
Fri, 9 Nov 2012 21:52:07 +0000 (13:52 -0800)
commitad9a921b92a964a0f28a5f0d59079cde5a0ada1e
tree218caac93e8acd2686521974ce77d165386c4e4b
parent55cbd05b18960e761a4d237ce5f1ff06455da98d
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.
14 files changed:
include/git2/checkout.h
include/git2/errors.h
src/checkout.c
src/fileops.c
src/fileops.h
src/index.c
src/index.h
src/path.c
src/reset.c
src/stash.c
tests-clar/checkout/index.c
tests-clar/checkout/tree.c
tests-clar/checkout/typechange.c
tests-clar/clone/network.c