kmx git

Commit	Date	Message
2998a84a	2021-08-29T21:49:33	Merge pull request #5841 from J0Nes90/features/checkout-dry-run Checkout dry-run
aebdee8e	2021-08-29T21:49:26	Update include/git2/checkout.h
f1697936	2021-07-06T17:44:38	Fix struct documentation formatting
958205a3	2021-04-14T22:05:47	implement GIT_CHECKOUT_DRY_RUN to allow notifications without touching the working directory
33448b45	2019-06-19T19:46:12	docs: More of it
764196ff	2019-06-13T20:17:01	doc: add missing documentation comments
0b5ba0d7	2019-06-06T16:36:23	Rename opt init functions to `options_init` In libgit2 nomenclature, when we need to verb a direct object, we name a function `git_directobject_verb`. Thus, if we need to init an options structure named `git_foo_options`, then the name of the function that does that should be `git_foo_options_init`. The previous names of `git_foo_init_options` is close - it _sounds_ as if it's initializing the options of a `foo`, but in fact `git_foo_options` is its own noun that should be respected. Deprecate the old names; they'll now call directly to the new ones.
bbba4805	2019-03-25T20:45:58	docs: clarify relation of safe and forced checkout strategy
20961b98	2018-12-26T14:06:21	git_error: use full class name in public error API Move to the `git_error` name in error-related functions, deprecating the `giterr` functions. This means, for example, that `giterr_last` is now `git_error_last`. The old names are retained for compatibility. This only updates the public API; internal API and function usage remains unchanged.
22d2062d	2019-01-09T18:25:10	Introduce GIT_CALLBACK macro to enforce cdecl Since we now always build the library with cdecl calling conventions, our callbacks should be decorated as such so that users will not be able to provide callbacks defined with other calling conventions. The `GIT_CALLBACK` macro will inject the `__cdecl` attribute as appropriate.
7283daa8	2018-10-01T21:00:15	doc: small fixups & additions
04c48afc	2018-04-20T21:07:17	docs: standardize struct git_*_options comments
ca5a15e5	2018-03-22T23:27:27	docs: standardize comment block for git_*_init_options functions
cdd0bc2f	2018-03-26T18:44:13	checkout: change default strategy to SAFE As per #4200, our default is quite surprising to users that expect checkout to just "do the thing".
b9266488	2016-06-14T12:27:03	documentation: improve docs for `checkout_head` `git_checkout_head` is sadly misunderstood as something that can switch branches. It cannot. Update the documentation to reflect this.
1f1f5c63	2015-05-11T14:10:24	checkout: better document the `baseline_index` opt
73dce1f6	2015-03-16T18:57:57	checkout: allow baseline to be specified as index Allow the baseline to be specified as an index, so that users need not write their index to a tree just to checkout with that as the baseline.
96b82b11	2015-02-14T11:44:05	checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategy
8639ea5f	2015-01-17T22:47:03	checkout: introduce GIT_CHECKOUT_DONT_WRITE_INDEX
e74340b0	2015-01-14T18:47:00	checkout: remove files before writing new ones On case insensitive filesystems, we may have files in the working directory that case fold to a name we want to write. Remove those files (by default) so that we will not end up with a filename that has the unexpected case.
1d50b364	2015-01-12T16:16:27	checkout: introduce git_checkout_perfdata Checkout can now provide performance data about the number of (some) syscalls performed using an optional callback.
eb5f0346	2014-07-11T12:22:48	checkout: fix docs formatting for the options
11e2665e	2014-06-02T18:53:32	Formatting fixes for the docs These are some issues I found while playing around with the new parser for docurium.
bc91347b	2014-04-30T11:16:31	Fix remaining init_options inconsistencies There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.
6affd71f	2014-01-03T17:38:34	git_checkout_opts -> git_checkout_options
b9f81997	2014-03-05T21:49:23	Added function-based initializers for every options struct. The basic structure of each function is courtesy of arrbee.
e651e8e2	2014-01-19T15:05:08	Introduce diff3 mode for checking out conflicts
81a2012d	2013-12-12T11:30:50	Overwrite ignored files on checkout
cbd04896	2013-12-10T14:38:35	Fix checkout notify callback docs and tests The checkout notify callback behavior on non-zero return values was not being tested. This adds tests, fixes a bug with positive values, and clarifies the documentation to make it clear that the checkout can be canceled via this mechanism.
35221441	2013-11-02T03:43:34	Checkout: Don't assert if treeish is NULL In git_checkout_tree, the first check tests if either repo or treeish is NULL and says that eithor of them has to have a valid value. But there is no code to handle the treeish == NULL case. So, do something meaningful in that case: use HEAD instead.
10749f6c	2013-11-02T03:20:05	Checkout: Unifiy const-ness of `opts` parameter Since all 3 checkout APIs perform the same operation with the options, all of them should use the same const-ness.
629b661c	2013-07-17T09:49:56	checkout (from index) can write conflicts
eec1c1fe	2013-09-20T22:49:20	clone: const-ify checkout options The removal of many options which lead to the direct usage of the user's checkout options means we should make sure they remain const.
605da51a	2013-09-17T09:50:30	No such thing as an orphan branch Unfortunately git-core uses the term "unborn branch" and "orphan branch" interchangeably. However, "orphan" is only really there for the checkout command, which has the `--orphan` option so it doesn't actually create the branch. Branches never have parents, so the distinction of a branch with no parents is odd to begin with. Crucially, the error messages deal with unborn branches, so let's use that.
9094ae5a	2013-06-21T11:51:16	Add target directory to checkout This adds the ability for checkout to write to a target directory instead of having to use the working directory of the repository. This makes it easier to do exports of repository data and the like. This is similar to, but not quite the same as, the --prefix option to `git checkout-index` (this will always be treated as a directory name, not just as a simple text prefix). As part of this, the workdir iterator was extended to take the path to the working directory as a parameter and fallback on the git_repository_workdir result only if it's not specified. Fixes #1332
36fd9e30	2013-06-21T11:20:54	Fix checkout of modified file when missing from wd This fixes the checkout case when a file is modified between the baseline and the target and yet missing in the working directory. The logic for that case appears to have been wrong. This also adds a useful checkout notify callback to the checkout test helpers that will count notifications and also has a debug mode to visualize what checkout thinks that it's doing.
e09d18ee	2013-05-03T18:39:44	allow checkout to proceed when a dir to be removed is in use (win32)
40342bd2	2013-01-10T15:15:37	Add GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH This adds an option to checkout a la the diff option to turn off fnmatch evaluation for pathspec entries. This can be useful to make sure your "pattern" in really interpretted as an exact file match only.
359fc2d2	2013-01-08T17:07:25	update copyrights
7eb222fc	2013-01-06T10:39:35	Correct typos in documentation
77cffa31	2013-01-02T17:14:00	Simplify checkout documentation This moves a lot of the detailed checkout documentation into a new file (docs/checkout-internals.md) and simplifies the public docs for the checkout API.
cf208031	2012-12-06T13:36:17	Rework checkout internals (again) I've tried to map out the detailed behaviors of checkout and make sure that we're handling the various cases correctly, along with providing options to allow us to emulate "git checkout" and "git checkout-index" with the various flags. I've thrown away flags in the checkout API that seemed like clutter and added some new ones. Also, I've converted the conflict callback to a general notification callback so we can emulate "git checkout" output and display "dirty" files. As of this commit, the new behavior is not working 100% but some of that is probably baked into tests that are not testing the right thing. This is a decent snapshot point, I think, along the way to getting the update done.
7e5c8a5b	2012-12-10T15:31:43	More checkout improvements This flips checkout back to be driven off the changes between the baseline and the target trees. This reinstates the complex code for tracking the contents of the working directory, but overall, I think the resulting logic is easier to follow.
5cf9875a	2012-12-18T15:19:24	Add index updating to checkout Make checkout update entries in the index for all files that are updated and/or removed, unless flag GIT_CHECKOUT_DONT_UPDATE_INDEX is given. To do this, iterators were extended to allow a little more introspection into the index being iterated over, etc.
fac43c54	2012-12-06T19:41:52	Allow compilation as C++
bde336ea	2012-11-29T12:26:09	Add version fields and init macros for public input structs.
cfbe4be3	2012-11-17T19:54:47	More external API cleanup Conflicts: src/branch.c tests-clar/refs/branches/create.c
bbe6dbec	2012-11-14T23:29:48	Add explicit git_index ptr to diff and checkout A number of diff APIs and the `git_checkout_index` API take a `git_repository` object an operate on the index. This updates them to take a `git_index` pointer explicitly and only fall back on the `git_repository` index if the index input is NULL. This makes it easier to operate on a temporary index.
0f3def71	2012-11-09T11:19:46	Fix various cross-platform build issues This fixes a number of warnings and problems with cross-platform builds. Among other things, it's not safe to name a member of a structure "strcmp" because that may be #defined.
ad9a921b	2012-11-08T17:05:07	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.
9c05c17b	2012-10-19T20:05:18	Checkout progress now reports completed/total steps
80642656	2012-10-16T20:23:10	Convert checkout_* to use progress callback
2c8bbb27	2012-10-16T20:16:21	Convert checkout_index to use progress callback
8b05bea8	2012-10-19T17:07:39	errors: deploy GIT_EORPHANEDHEAD usage
4c47a8bc	2012-10-17T14:14:51	Merge pull request #968 from arrbee/diff-support-typechange Support TYPECHANGE records in status and adjust checkout accordingly
b46708aa	2012-10-11T23:04:08	Separated git_strarray from common.h. Added doxy comments.
fe67e404	2012-10-09T14:35:24	Move enum comments next to actual values
0d64bef9	2012-10-05T15:56:57	Add complex checkout test and then fix checkout This started as a complex new test for checkout going through the "typechanges" test repository, but that revealed numerous issues with checkout, including: * complete failure with submodules * failure to create blobs with exec bits * problems when replacing a tree with a blob because the tree "example/" sorts after the blob "example" so the delete was being processed after the single file blob was created This fixes most of those problems and includes a number of other minor changes that made it easier to do that, including improving the TYPECHANGE support in diff/status, etc.
9e592583	2012-09-19T12:23:47	checkout: add notification callback for skipped files
39783719	2012-09-17T20:27:28	checkout: Mimic git_diff_options storage of paths
c214fa1c	2012-09-06T15:15:46	checkout: segregate checkout strategies
5af61863	2012-09-14T11:15:49	checkout: drop git_checkout_reference()
e93af304	2012-08-24T10:40:17	checkout: introduce git_checkout_index()
3aa443a9	2012-08-20T16:56:45	checkout: introduce git_checkout_tree()
746642a6	2012-08-20T12:30:54	checkout: fix documentation code alignment
5280f4e6	2012-07-31T19:39:06	Add checkout.h to git2.h. Also correcting some documentation strings.
b31667fb	2012-07-27T20:29:06	Checkout: add head- and ref-centric checkouts. Renamed git_checkout_index to what it really was, and removed duplicate code from clone.c. Added git_checkout_ref, which updates HEAD and hands off to git_checkout_head. Added tests for the options the caller can pass to git_checkout_*.
095ccc01	2012-07-26T16:31:49	Checkout: implementation of most options
b401bace	2012-07-26T13:12:21	Restructure for better checkout options * Removed the #define for defaults * Promoted progress structure to top-level API call argument
ef9905c9	2012-07-26T12:58:44	checkout: introduce git_checkout_opts Refactor checkout into several more-sensible entry points, which consolidates common options into a single structure that may be passed around.
deac801d	2012-07-13T15:50:23	Fix documentation comment to match actual params.
14741d62	2012-06-21T11:13:19	Clone: new home for git_checkout_force.

2998a84a

2021-08-29T21:49:33

Merge pull request #5841 from J0Nes90/features/checkout-dry-run Checkout dry-run

aebdee8e

2021-08-29T21:49:26

Update include/git2/checkout.h

f1697936

2021-07-06T17:44:38

Fix struct documentation formatting

958205a3

2021-04-14T22:05:47

implement GIT_CHECKOUT_DRY_RUN to allow notifications without touching the working directory

33448b45

2019-06-19T19:46:12

docs: More of it

764196ff

2019-06-13T20:17:01

doc: add missing documentation comments

0b5ba0d7

2019-06-06T16:36:23

Rename opt init functions to `options_init` In libgit2 nomenclature, when we need to verb a direct object, we name a function `git_directobject_verb`. Thus, if we need to init an options structure named `git_foo_options`, then the name of the function that does that should be `git_foo_options_init`. The previous names of `git_foo_init_options` is close - it _sounds_ as if it's initializing the options of a `foo`, but in fact `git_foo_options` is its own noun that should be respected. Deprecate the old names; they'll now call directly to the new ones.

bbba4805

2019-03-25T20:45:58

docs: clarify relation of safe and forced checkout strategy

20961b98

2018-12-26T14:06:21

git_error: use full class name in public error API Move to the `git_error` name in error-related functions, deprecating the `giterr` functions. This means, for example, that `giterr_last` is now `git_error_last`. The old names are retained for compatibility. This only updates the public API; internal API and function usage remains unchanged.

22d2062d

2019-01-09T18:25:10

Introduce GIT_CALLBACK macro to enforce cdecl Since we now always build the library with cdecl calling conventions, our callbacks should be decorated as such so that users will not be able to provide callbacks defined with other calling conventions. The `GIT_CALLBACK` macro will inject the `__cdecl` attribute as appropriate.

7283daa8

2018-10-01T21:00:15

doc: small fixups & additions

04c48afc

2018-04-20T21:07:17

docs: standardize struct git_*_options comments

ca5a15e5

2018-03-22T23:27:27

docs: standardize comment block for git_*_init_options functions

cdd0bc2f

2018-03-26T18:44:13

checkout: change default strategy to SAFE As per #4200, our default is quite surprising to users that expect checkout to just "do the thing".

b9266488

2016-06-14T12:27:03

documentation: improve docs for `checkout_head` `git_checkout_head` is sadly misunderstood as something that can switch branches. It cannot. Update the documentation to reflect this.

1f1f5c63

2015-05-11T14:10:24

checkout: better document the `baseline_index` opt

73dce1f6

2015-03-16T18:57:57

checkout: allow baseline to be specified as index Allow the baseline to be specified as an index, so that users need not write their index to a tree just to checkout with that as the baseline.

96b82b11

2015-02-14T11:44:05

checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategy

8639ea5f

2015-01-17T22:47:03

checkout: introduce GIT_CHECKOUT_DONT_WRITE_INDEX

e74340b0

2015-01-14T18:47:00

checkout: remove files before writing new ones On case insensitive filesystems, we may have files in the working directory that case fold to a name we want to write. Remove those files (by default) so that we will not end up with a filename that has the unexpected case.

1d50b364

2015-01-12T16:16:27

checkout: introduce git_checkout_perfdata Checkout can now provide performance data about the number of (some) syscalls performed using an optional callback.

eb5f0346

2014-07-11T12:22:48

checkout: fix docs formatting for the options

11e2665e

2014-06-02T18:53:32

Formatting fixes for the docs These are some issues I found while playing around with the new parser for docurium.

bc91347b

2014-04-30T11:16:31

Fix remaining init_options inconsistencies There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.

6affd71f

2014-01-03T17:38:34

git_checkout_opts -> git_checkout_options

b9f81997

2014-03-05T21:49:23

Added function-based initializers for every options struct. The basic structure of each function is courtesy of arrbee.

e651e8e2

2014-01-19T15:05:08

Introduce diff3 mode for checking out conflicts

81a2012d

2013-12-12T11:30:50

Overwrite ignored files on checkout

cbd04896

2013-12-10T14:38:35

Fix checkout notify callback docs and tests The checkout notify callback behavior on non-zero return values was not being tested. This adds tests, fixes a bug with positive values, and clarifies the documentation to make it clear that the checkout can be canceled via this mechanism.

35221441

2013-11-02T03:43:34

Checkout: Don't assert if treeish is NULL In git_checkout_tree, the first check tests if either repo or treeish is NULL and says that eithor of them has to have a valid value. But there is no code to handle the treeish == NULL case. So, do something meaningful in that case: use HEAD instead.

10749f6c

2013-11-02T03:20:05

Checkout: Unifiy const-ness of `opts` parameter Since all 3 checkout APIs perform the same operation with the options, all of them should use the same const-ness.

629b661c

2013-07-17T09:49:56

checkout (from index) can write conflicts

eec1c1fe

2013-09-20T22:49:20

clone: const-ify checkout options The removal of many options which lead to the direct usage of the user's checkout options means we should make sure they remain const.

605da51a

2013-09-17T09:50:30

No such thing as an orphan branch Unfortunately git-core uses the term "unborn branch" and "orphan branch" interchangeably. However, "orphan" is only really there for the checkout command, which has the `--orphan` option so it doesn't actually create the branch. Branches never have parents, so the distinction of a branch with no parents is odd to begin with. Crucially, the error messages deal with unborn branches, so let's use that.

9094ae5a

2013-06-21T11:51:16

Add target directory to checkout This adds the ability for checkout to write to a target directory instead of having to use the working directory of the repository. This makes it easier to do exports of repository data and the like. This is similar to, but not quite the same as, the --prefix option to `git checkout-index` (this will always be treated as a directory name, not just as a simple text prefix). As part of this, the workdir iterator was extended to take the path to the working directory as a parameter and fallback on the git_repository_workdir result only if it's not specified. Fixes #1332

36fd9e30

2013-06-21T11:20:54

Fix checkout of modified file when missing from wd This fixes the checkout case when a file is modified between the baseline and the target and yet missing in the working directory. The logic for that case appears to have been wrong. This also adds a useful checkout notify callback to the checkout test helpers that will count notifications and also has a debug mode to visualize what checkout thinks that it's doing.

e09d18ee

2013-05-03T18:39:44

allow checkout to proceed when a dir to be removed is in use (win32)

40342bd2

2013-01-10T15:15:37

Add GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH This adds an option to checkout a la the diff option to turn off fnmatch evaluation for pathspec entries. This can be useful to make sure your "pattern" in really interpretted as an exact file match only.

359fc2d2

2013-01-08T17:07:25

update copyrights

7eb222fc

2013-01-06T10:39:35

Correct typos in documentation

77cffa31

2013-01-02T17:14:00

Simplify checkout documentation This moves a lot of the detailed checkout documentation into a new file (docs/checkout-internals.md) and simplifies the public docs for the checkout API.

cf208031

2012-12-06T13:36:17

Rework checkout internals (again) I've tried to map out the detailed behaviors of checkout and make sure that we're handling the various cases correctly, along with providing options to allow us to emulate "git checkout" and "git checkout-index" with the various flags. I've thrown away flags in the checkout API that seemed like clutter and added some new ones. Also, I've converted the conflict callback to a general notification callback so we can emulate "git checkout" output and display "dirty" files. As of this commit, the new behavior is not working 100% but some of that is probably baked into tests that are not testing the right thing. This is a decent snapshot point, I think, along the way to getting the update done.

7e5c8a5b

2012-12-10T15:31:43

More checkout improvements This flips checkout back to be driven off the changes between the baseline and the target trees. This reinstates the complex code for tracking the contents of the working directory, but overall, I think the resulting logic is easier to follow.

5cf9875a

2012-12-18T15:19:24

Add index updating to checkout Make checkout update entries in the index for all files that are updated and/or removed, unless flag GIT_CHECKOUT_DONT_UPDATE_INDEX is given. To do this, iterators were extended to allow a little more introspection into the index being iterated over, etc.

fac43c54

2012-12-06T19:41:52

Allow compilation as C++

bde336ea

2012-11-29T12:26:09

Add version fields and init macros for public input structs.

cfbe4be3

2012-11-17T19:54:47

More external API cleanup Conflicts: src/branch.c tests-clar/refs/branches/create.c

bbe6dbec

2012-11-14T23:29:48

Add explicit git_index ptr to diff and checkout A number of diff APIs and the `git_checkout_index` API take a `git_repository` object an operate on the index. This updates them to take a `git_index` pointer explicitly and only fall back on the `git_repository` index if the index input is NULL. This makes it easier to operate on a temporary index.

0f3def71

2012-11-09T11:19:46

Fix various cross-platform build issues This fixes a number of warnings and problems with cross-platform builds. Among other things, it's not safe to name a member of a structure "strcmp" because that may be #defined.

ad9a921b

2012-11-08T17:05:07

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.

9c05c17b

2012-10-19T20:05:18

Checkout progress now reports completed/total steps

80642656

2012-10-16T20:23:10

Convert checkout_* to use progress callback

2c8bbb27

2012-10-16T20:16:21

Convert checkout_index to use progress callback

8b05bea8

2012-10-19T17:07:39

errors: deploy GIT_EORPHANEDHEAD usage

4c47a8bc

2012-10-17T14:14:51

Merge pull request #968 from arrbee/diff-support-typechange Support TYPECHANGE records in status and adjust checkout accordingly

b46708aa

2012-10-11T23:04:08

Separated git_strarray from common.h. Added doxy comments.

fe67e404

2012-10-09T14:35:24

Move enum comments next to actual values

0d64bef9

2012-10-05T15:56:57

Add complex checkout test and then fix checkout This started as a complex new test for checkout going through the "typechanges" test repository, but that revealed numerous issues with checkout, including: * complete failure with submodules * failure to create blobs with exec bits * problems when replacing a tree with a blob because the tree "example/" sorts after the blob "example" so the delete was being processed after the single file blob was created This fixes most of those problems and includes a number of other minor changes that made it easier to do that, including improving the TYPECHANGE support in diff/status, etc.

9e592583

2012-09-19T12:23:47

checkout: add notification callback for skipped files

39783719

2012-09-17T20:27:28

checkout: Mimic git_diff_options storage of paths

c214fa1c

2012-09-06T15:15:46

checkout: segregate checkout strategies

5af61863

2012-09-14T11:15:49

checkout: drop git_checkout_reference()

e93af304

2012-08-24T10:40:17

checkout: introduce git_checkout_index()

3aa443a9

2012-08-20T16:56:45

checkout: introduce git_checkout_tree()

746642a6

2012-08-20T12:30:54

checkout: fix documentation code alignment

5280f4e6

2012-07-31T19:39:06

Add checkout.h to git2.h. Also correcting some documentation strings.

b31667fb

2012-07-27T20:29:06

Checkout: add head- and ref-centric checkouts. Renamed git_checkout_index to what it really was, and removed duplicate code from clone.c. Added git_checkout_ref, which updates HEAD and hands off to git_checkout_head. Added tests for the options the caller can pass to git_checkout_*.

095ccc01

2012-07-26T16:31:49

Checkout: implementation of most options

b401bace

2012-07-26T13:12:21

Restructure for better checkout options * Removed the #define for defaults * Promoted progress structure to top-level API call argument

ef9905c9

2012-07-26T12:58:44

checkout: introduce git_checkout_opts Refactor checkout into several more-sensible entry points, which consolidates common options into a single structure that may be passed around.

deac801d

2012-07-13T15:50:23

Fix documentation comment to match actual params.

14741d62

2012-06-21T11:13:19

Clone: new home for git_checkout_force.

thodg/libgit2/include/git2/checkout.h

include/git2/checkout.h

Log