Skip to content

Commit 04c48af

Browse files
committed
docs: standardize struct git_*_options comments
1 parent c7b42f4 commit 04c48af

File tree

8 files changed

+26
-27
lines changed

8 files changed

+26
-27
lines changed

include/git2/blame.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ typedef enum {
4848
/**
4949
* Blame options structure
5050
*
51-
* Use zeros to indicate default settings. It's easiest to use the
52-
* `GIT_BLAME_OPTIONS_INIT` macro:
53-
* git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
51+
* Initialize with `GIT_BLAME_OPTIONS_INIT`. Alternatively, you can
52+
* use `git_blame_init_options`.
5453
*
5554
*/
5655
typedef struct git_blame_options {

include/git2/checkout.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,9 @@ typedef void (*git_checkout_perfdata_cb)(
243243
/**
244244
* Checkout options structure
245245
*
246-
* Zero out for defaults. Initialize with `GIT_CHECKOUT_OPTIONS_INIT` macro to
247-
* correctly set the `version` field. E.g.
246+
* Initialize with `GIT_CHECKOUT_OPTIONS_INIT`. Alternatively, you can
247+
* use `git_checkout_init_options`.
248248
*
249-
* git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
250249
*/
251250
typedef struct git_checkout_options {
252251
unsigned int version;

include/git2/clone.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ typedef int (*git_repository_create_cb)(
9696
/**
9797
* Clone options structure
9898
*
99-
* Use the GIT_CLONE_OPTIONS_INIT to get the default settings, like this:
99+
* Initialize with `GIT_CLONE_OPTIONS_INIT`. Alternatively, you can
100+
* use `git_clone_init_options`.
100101
*
101-
* git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
102102
*/
103103
typedef struct git_clone_options {
104104
unsigned int version;

include/git2/describe.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ typedef enum {
3636
/**
3737
* Describe options structure
3838
*
39-
* Initialize with `GIT_DESCRIBE_OPTIONS_INIT` macro to correctly set
40-
* the `version` field. E.g.
39+
* Initialize with `GIT_DESCRIBE_OPTIONS_INIT`. Alternatively, you can
40+
* use `git_describe_init_options`.
4141
*
42-
* git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
4342
*/
4443
typedef struct git_describe_options {
4544
unsigned int version;
@@ -83,7 +82,11 @@ typedef struct git_describe_options {
8382
GIT_EXTERN(int) git_describe_init_options(git_describe_options *opts, unsigned int version);
8483

8584
/**
86-
* Options for formatting the describe string
85+
* Describe format options structure
86+
*
87+
* Initialize with `GIT_DESCRIBE_FORMAT_OPTIONS_INIT`. Alternatively, you can
88+
* use `git_describe_format_init_options`.
89+
*
8790
*/
8891
typedef struct {
8992
unsigned int version;

include/git2/diff.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,8 +1414,9 @@ GIT_EXTERN(int) git_diff_format_email_init_options(
14141414
/**
14151415
* Patch ID options structure
14161416
*
1417-
* Initialize with `GIT_DIFF_PATCHID_OPTIONS_INIT` macro to
1418-
* correctly set the default values and version.
1417+
* Initialize with `GIT_PATCHID_OPTIONS_INIT`. Alternatively, you can
1418+
* use `git_patchid_init_options`.
1419+
*
14191420
*/
14201421
typedef struct git_diff_patchid_options {
14211422
unsigned int version;

include/git2/stash.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ typedef int (*git_stash_apply_progress_cb)(
116116
git_stash_apply_progress_t progress,
117117
void *payload);
118118

119-
/** Stash application options structure.
119+
/**
120+
* Stash application options structure
120121
*
121-
* Initialize with the `GIT_STASH_APPLY_OPTIONS_INIT` macro to set
122-
* sensible defaults; for example:
122+
* Initialize with `GIT_STASH_APPLY_OPTIONS_INIT`. Alternatively, you can
123+
* use `git_stash_apply_init_options`.
123124
*
124-
* git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT;
125125
*/
126126
typedef struct git_stash_apply_options {
127127
unsigned int version;

include/git2/submodule.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,9 @@ typedef int (*git_submodule_cb)(
121121
/**
122122
* Submodule update options structure
123123
*
124-
* Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings,
125-
* like this:
124+
* Initialize with `GIT_SUBMODULE_UPDATE_OPTIONS_INIT`. Alternatively, you can
125+
* use `git_submodule_update_init_options`.
126126
*
127-
* git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;
128127
*/
129128
typedef struct git_submodule_update_options {
130129
unsigned int version;

include/git2/worktree.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,9 @@ GIT_EXTERN(int) git_worktree_validate(const git_worktree *wt);
7777
/**
7878
* Worktree add options structure
7979
*
80-
* Zero out for defaults. Initialize with `GIT_WORKTREE_ADD_OPTIONS_INIT`
81-
* macro to correctly set the `version` field. E.g.
80+
* Initialize with `GIT_WORKTREE_ADD_OPTIONS_INIT`. Alternatively, you can
81+
* use `git_worktree_add_init_options`.
8282
*
83-
* git_worktree_add_options opts = GIT_WORKTREE_ADD_OPTIONS_INIT;
8483
*/
8584
typedef struct git_worktree_add_options {
8685
unsigned int version;
@@ -192,10 +191,9 @@ typedef enum {
192191
/**
193192
* Worktree prune options structure
194193
*
195-
* Zero out for defaults. Initialize with `GIT_WORKTREE_PRUNE_OPTIONS_INIT`
196-
* macro to correctly set the `version` field. E.g.
194+
* Initialize with `GIT_WORKTREE_PRUNE_OPTIONS_INIT`. Alternatively, you can
195+
* use `git_worktree_prune_init_options`.
197196
*
198-
* git_worktree_prune_options opts = GIT_WORKTREE_PRUNE_OPTIONS_INIT;
199197
*/
200198
typedef struct git_worktree_prune_options {
201199
unsigned int version;

0 commit comments

Comments
 (0)