Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
38c34498
Commit
38c34498
authored
Oct 03, 2021
by
Peter Pettersson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make enum in includes C90 compliant by removing trailing comma.
parent
5221e185
Show whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
72 additions
and
72 deletions
+72
-72
include/git2/apply.h
+2
-2
include/git2/attr.h
+1
-1
include/git2/blame.h
+1
-1
include/git2/blob.h
+1
-1
include/git2/cert.h
+2
-2
include/git2/checkout.h
+1
-1
include/git2/clone.h
+1
-1
include/git2/common.h
+1
-1
include/git2/config.h
+1
-1
include/git2/credential.h
+1
-1
include/git2/deprecated.h
+1
-1
include/git2/describe.h
+1
-1
include/git2/diff.h
+7
-7
include/git2/email.h
+1
-1
include/git2/errors.h
+1
-1
include/git2/filter.h
+2
-2
include/git2/index.h
+5
-5
include/git2/merge.h
+5
-5
include/git2/odb_backend.h
+1
-1
include/git2/pack.h
+1
-1
include/git2/pathspec.h
+1
-1
include/git2/proxy.h
+1
-1
include/git2/rebase.h
+1
-1
include/git2/refs.h
+1
-1
include/git2/remote.h
+4
-4
include/git2/repository.h
+4
-4
include/git2/reset.h
+1
-1
include/git2/revparse.h
+1
-1
include/git2/revwalk.h
+1
-1
include/git2/stash.h
+3
-3
include/git2/status.h
+3
-3
include/git2/submodule.h
+1
-1
include/git2/sys/commit_graph.h
+1
-1
include/git2/sys/stream.h
+1
-1
include/git2/sys/transport.h
+2
-2
include/git2/tree.h
+2
-2
include/git2/types.h
+6
-6
include/git2/worktree.h
+1
-1
No files found.
include/git2/apply.h
View file @
38c34498
...
@@ -59,7 +59,7 @@ typedef enum {
...
@@ -59,7 +59,7 @@ typedef enum {
* Don't actually make changes, just test that the patch applies.
* Don't actually make changes, just test that the patch applies.
* This is the equivalent of `git apply --check`.
* This is the equivalent of `git apply --check`.
*/
*/
GIT_APPLY_CHECK
=
(
1
<<
0
)
,
GIT_APPLY_CHECK
=
(
1
<<
0
)
}
git_apply_flags_t
;
}
git_apply_flags_t
;
/**
/**
...
@@ -127,7 +127,7 @@ typedef enum {
...
@@ -127,7 +127,7 @@ typedef enum {
* Apply the patch to both the working directory and the index.
* Apply the patch to both the working directory and the index.
* This is the equivalent of `git apply --index`.
* This is the equivalent of `git apply --index`.
*/
*/
GIT_APPLY_LOCATION_BOTH
=
2
,
GIT_APPLY_LOCATION_BOTH
=
2
}
git_apply_location_t
;
}
git_apply_location_t
;
/**
/**
...
...
include/git2/attr.h
View file @
38c34498
...
@@ -83,7 +83,7 @@ typedef enum {
...
@@ -83,7 +83,7 @@ typedef enum {
GIT_ATTR_VALUE_UNSPECIFIED
=
0
,
/**< The attribute has been left unspecified */
GIT_ATTR_VALUE_UNSPECIFIED
=
0
,
/**< The attribute has been left unspecified */
GIT_ATTR_VALUE_TRUE
,
/**< The attribute has been set */
GIT_ATTR_VALUE_TRUE
,
/**< The attribute has been set */
GIT_ATTR_VALUE_FALSE
,
/**< The attribute has been unset */
GIT_ATTR_VALUE_FALSE
,
/**< The attribute has been unset */
GIT_ATTR_VALUE_STRING
,
/**< This attribute has a value */
GIT_ATTR_VALUE_STRING
/**< This attribute has a value */
}
git_attr_value_t
;
}
git_attr_value_t
;
/**
/**
...
...
include/git2/blame.h
View file @
38c34498
...
@@ -73,7 +73,7 @@ typedef enum {
...
@@ -73,7 +73,7 @@ typedef enum {
GIT_BLAME_USE_MAILMAP
=
(
1
<<
5
),
GIT_BLAME_USE_MAILMAP
=
(
1
<<
5
),
/** Ignore whitespace differences */
/** Ignore whitespace differences */
GIT_BLAME_IGNORE_WHITESPACE
=
(
1
<<
6
)
,
GIT_BLAME_IGNORE_WHITESPACE
=
(
1
<<
6
)
}
git_blame_flag_t
;
}
git_blame_flag_t
;
/**
/**
...
...
include/git2/blob.h
View file @
38c34498
...
@@ -119,7 +119,7 @@ typedef enum {
...
@@ -119,7 +119,7 @@ typedef enum {
* When set, filters will be loaded from a `.gitattributes` file
* When set, filters will be loaded from a `.gitattributes` file
* in the specified commit.
* in the specified commit.
*/
*/
GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT
=
(
1
<<
3
)
,
GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT
=
(
1
<<
3
)
}
git_blob_filter_flag_t
;
}
git_blob_filter_flag_t
;
/**
/**
...
...
include/git2/cert.h
View file @
38c34498
...
@@ -44,7 +44,7 @@ typedef enum git_cert_t {
...
@@ -44,7 +44,7 @@ typedef enum git_cert_t {
* information about the certificate. This is used when using
* information about the certificate. This is used when using
* curl.
* curl.
*/
*/
GIT_CERT_STRARRAY
,
GIT_CERT_STRARRAY
}
git_cert_t
;
}
git_cert_t
;
/**
/**
...
@@ -82,7 +82,7 @@ typedef enum {
...
@@ -82,7 +82,7 @@ typedef enum {
/** SHA-256 is available */
/** SHA-256 is available */
GIT_CERT_SSH_SHA256
=
(
1
<<
2
),
GIT_CERT_SSH_SHA256
=
(
1
<<
2
),
/** Raw hostkey is available */
/** Raw hostkey is available */
GIT_CERT_SSH_RAW
=
(
1
<<
3
)
,
GIT_CERT_SSH_RAW
=
(
1
<<
3
)
}
git_cert_ssh_t
;
}
git_cert_ssh_t
;
typedef
enum
{
typedef
enum
{
...
...
include/git2/checkout.h
View file @
38c34498
...
@@ -190,7 +190,7 @@ typedef enum {
...
@@ -190,7 +190,7 @@ typedef enum {
/** Recursively checkout submodules with same options (NOT IMPLEMENTED) */
/** Recursively checkout submodules with same options (NOT IMPLEMENTED) */
GIT_CHECKOUT_UPDATE_SUBMODULES
=
(
1u
<<
16
),
GIT_CHECKOUT_UPDATE_SUBMODULES
=
(
1u
<<
16
),
/** Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED) */
/** Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED) */
GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED
=
(
1u
<<
17
)
,
GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED
=
(
1u
<<
17
)
}
git_checkout_strategy_t
;
}
git_checkout_strategy_t
;
...
...
include/git2/clone.h
View file @
38c34498
...
@@ -49,7 +49,7 @@ typedef enum {
...
@@ -49,7 +49,7 @@ typedef enum {
* Bypass the git-aware transport, but do not try to use
* Bypass the git-aware transport, but do not try to use
* hardlinks.
* hardlinks.
*/
*/
GIT_CLONE_LOCAL_NO_LINKS
,
GIT_CLONE_LOCAL_NO_LINKS
}
git_clone_local_t
;
}
git_clone_local_t
;
/**
/**
...
...
include/git2/common.h
View file @
38c34498
...
@@ -147,7 +147,7 @@ typedef enum {
...
@@ -147,7 +147,7 @@ typedef enum {
* If set, libgit2 was built with support for sub-second resolution in file
* If set, libgit2 was built with support for sub-second resolution in file
* modification times.
* modification times.
*/
*/
GIT_FEATURE_NSEC
=
(
1
<<
3
)
,
GIT_FEATURE_NSEC
=
(
1
<<
3
)
}
git_feature_t
;
}
git_feature_t
;
/**
/**
...
...
include/git2/config.h
View file @
38c34498
...
@@ -55,7 +55,7 @@ typedef enum {
...
@@ -55,7 +55,7 @@ typedef enum {
/** Represents the highest level available config file (i.e. the most
/** Represents the highest level available config file (i.e. the most
* specific config file available that actually is loaded)
* specific config file available that actually is loaded)
*/
*/
GIT_CONFIG_HIGHEST_LEVEL
=
-
1
,
GIT_CONFIG_HIGHEST_LEVEL
=
-
1
}
git_config_level_t
;
}
git_config_level_t
;
/**
/**
...
...
include/git2/credential.h
View file @
38c34498
...
@@ -75,7 +75,7 @@ typedef enum {
...
@@ -75,7 +75,7 @@ typedef enum {
*
*
* @see git_credential_ssh_key_memory_new
* @see git_credential_ssh_key_memory_new
*/
*/
GIT_CREDENTIAL_SSH_MEMORY
=
(
1u
<<
6
)
,
GIT_CREDENTIAL_SSH_MEMORY
=
(
1u
<<
6
)
}
git_credential_t
;
}
git_credential_t
;
/**
/**
...
...
include/git2/deprecated.h
View file @
38c34498
...
@@ -313,7 +313,7 @@ typedef enum {
...
@@ -313,7 +313,7 @@ typedef enum {
GIT_DIFF_FORMAT_EMAIL_NONE
=
0
,
GIT_DIFF_FORMAT_EMAIL_NONE
=
0
,
/** Don't insert "[PATCH]" in the subject header*/
/** Don't insert "[PATCH]" in the subject header*/
GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER
=
(
1
<<
0
)
,
GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER
=
(
1
<<
0
)
}
git_diff_format_email_flags_t
;
}
git_diff_format_email_flags_t
;
...
...
include/git2/describe.h
View file @
38c34498
...
@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
...
@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
typedef
enum
{
typedef
enum
{
GIT_DESCRIBE_DEFAULT
,
GIT_DESCRIBE_DEFAULT
,
GIT_DESCRIBE_TAGS
,
GIT_DESCRIBE_TAGS
,
GIT_DESCRIBE_ALL
,
GIT_DESCRIBE_ALL
}
git_describe_strategy_t
;
}
git_describe_strategy_t
;
/**
/**
...
...
include/git2/diff.h
View file @
38c34498
...
@@ -170,7 +170,7 @@ typedef enum {
...
@@ -170,7 +170,7 @@ typedef enum {
/** Include the necessary deflate / delta information so that `git-apply`
/** Include the necessary deflate / delta information so that `git-apply`
* can apply given diff information to binary files.
* can apply given diff information to binary files.
*/
*/
GIT_DIFF_SHOW_BINARY
=
(
1u
<<
30
)
,
GIT_DIFF_SHOW_BINARY
=
(
1u
<<
30
)
}
git_diff_option_t
;
}
git_diff_option_t
;
/**
/**
...
@@ -207,7 +207,7 @@ typedef enum {
...
@@ -207,7 +207,7 @@ typedef enum {
GIT_DIFF_FLAG_BINARY
=
(
1u
<<
0
),
/**< file(s) treated as binary data */
GIT_DIFF_FLAG_BINARY
=
(
1u
<<
0
),
/**< file(s) treated as binary data */
GIT_DIFF_FLAG_NOT_BINARY
=
(
1u
<<
1
),
/**< file(s) treated as text data */
GIT_DIFF_FLAG_NOT_BINARY
=
(
1u
<<
1
),
/**< file(s) treated as text data */
GIT_DIFF_FLAG_VALID_ID
=
(
1u
<<
2
),
/**< `id` value is known correct */
GIT_DIFF_FLAG_VALID_ID
=
(
1u
<<
2
),
/**< `id` value is known correct */
GIT_DIFF_FLAG_EXISTS
=
(
1u
<<
3
)
,
/**< file exists at this side of the delta */
GIT_DIFF_FLAG_EXISTS
=
(
1u
<<
3
)
/**< file exists at this side of the delta */
}
git_diff_flag_t
;
}
git_diff_flag_t
;
/**
/**
...
@@ -231,7 +231,7 @@ typedef enum {
...
@@ -231,7 +231,7 @@ typedef enum {
GIT_DELTA_UNTRACKED
=
7
,
/**< entry is untracked item in workdir */
GIT_DELTA_UNTRACKED
=
7
,
/**< entry is untracked item in workdir */
GIT_DELTA_TYPECHANGE
=
8
,
/**< type of entry changed between old and new */
GIT_DELTA_TYPECHANGE
=
8
,
/**< type of entry changed between old and new */
GIT_DELTA_UNREADABLE
=
9
,
/**< entry is unreadable */
GIT_DELTA_UNREADABLE
=
9
,
/**< entry is unreadable */
GIT_DELTA_CONFLICTED
=
10
,
/**< entry in the index is conflicted */
GIT_DELTA_CONFLICTED
=
10
/**< entry in the index is conflicted */
}
git_delta_t
;
}
git_delta_t
;
/**
/**
...
@@ -497,7 +497,7 @@ typedef enum {
...
@@ -497,7 +497,7 @@ typedef enum {
GIT_DIFF_BINARY_LITERAL
,
GIT_DIFF_BINARY_LITERAL
,
/** The binary data is the delta from one side to the other. */
/** The binary data is the delta from one side to the other. */
GIT_DIFF_BINARY_DELTA
,
GIT_DIFF_BINARY_DELTA
}
git_diff_binary_t
;
}
git_diff_binary_t
;
/** The contents of one of the files in a binary diff. */
/** The contents of one of the files in a binary diff. */
...
@@ -706,7 +706,7 @@ typedef enum {
...
@@ -706,7 +706,7 @@ typedef enum {
* GIT_DIFF_INCLUDE_UNMODIFIED flag. If you do not want UNMODIFIED
* GIT_DIFF_INCLUDE_UNMODIFIED flag. If you do not want UNMODIFIED
* records in the final result, pass this flag to have them removed.
* records in the final result, pass this flag to have them removed.
*/
*/
GIT_DIFF_FIND_REMOVE_UNMODIFIED
=
(
1u
<<
16
)
,
GIT_DIFF_FIND_REMOVE_UNMODIFIED
=
(
1u
<<
16
)
}
git_diff_find_t
;
}
git_diff_find_t
;
/**
/**
...
@@ -1107,7 +1107,7 @@ typedef enum {
...
@@ -1107,7 +1107,7 @@ typedef enum {
GIT_DIFF_FORMAT_RAW
=
3u
,
/**< like git diff --raw */
GIT_DIFF_FORMAT_RAW
=
3u
,
/**< like git diff --raw */
GIT_DIFF_FORMAT_NAME_ONLY
=
4u
,
/**< like git diff --name-only */
GIT_DIFF_FORMAT_NAME_ONLY
=
4u
,
/**< like git diff --name-only */
GIT_DIFF_FORMAT_NAME_STATUS
=
5u
,
/**< like git diff --name-status */
GIT_DIFF_FORMAT_NAME_STATUS
=
5u
,
/**< like git diff --name-status */
GIT_DIFF_FORMAT_PATCH_ID
=
6u
,
/**< git diff as used by git patch-id */
GIT_DIFF_FORMAT_PATCH_ID
=
6u
/**< git diff as used by git patch-id */
}
git_diff_format_t
;
}
git_diff_format_t
;
/**
/**
...
@@ -1311,7 +1311,7 @@ typedef enum {
...
@@ -1311,7 +1311,7 @@ typedef enum {
GIT_DIFF_STATS_NUMBER
=
(
1u
<<
2
),
GIT_DIFF_STATS_NUMBER
=
(
1u
<<
2
),
/** Extended header information such as creations, renames and mode changes, equivalent of `--summary` */
/** Extended header information such as creations, renames and mode changes, equivalent of `--summary` */
GIT_DIFF_STATS_INCLUDE_SUMMARY
=
(
1u
<<
3
)
,
GIT_DIFF_STATS_INCLUDE_SUMMARY
=
(
1u
<<
3
)
}
git_diff_stats_format_t
;
}
git_diff_stats_format_t
;
/**
/**
...
...
include/git2/email.h
View file @
38c34498
...
@@ -34,7 +34,7 @@ typedef enum {
...
@@ -34,7 +34,7 @@ typedef enum {
GIT_EMAIL_CREATE_ALWAYS_NUMBER
=
(
1u
<<
1
),
GIT_EMAIL_CREATE_ALWAYS_NUMBER
=
(
1u
<<
1
),
/** Do not perform rename or similarity detection. */
/** Do not perform rename or similarity detection. */
GIT_EMAIL_CREATE_NO_RENAMES
=
(
1u
<<
2
)
,
GIT_EMAIL_CREATE_NO_RENAMES
=
(
1u
<<
2
)
}
git_email_create_flags_t
;
}
git_email_create_flags_t
;
/**
/**
...
...
include/git2/errors.h
View file @
38c34498
...
@@ -57,7 +57,7 @@ typedef enum {
...
@@ -57,7 +57,7 @@ typedef enum {
GIT_RETRY
=
-
32
,
/**< Internal only */
GIT_RETRY
=
-
32
,
/**< Internal only */
GIT_EMISMATCH
=
-
33
,
/**< Hashsum mismatch in object */
GIT_EMISMATCH
=
-
33
,
/**< Hashsum mismatch in object */
GIT_EINDEXDIRTY
=
-
34
,
/**< Unsaved changes in the index would be overwritten */
GIT_EINDEXDIRTY
=
-
34
,
/**< Unsaved changes in the index would be overwritten */
GIT_EAPPLYFAIL
=
-
35
,
/**< Patch application failed */
GIT_EAPPLYFAIL
=
-
35
/**< Patch application failed */
}
git_error_code
;
}
git_error_code
;
/**
/**
...
...
include/git2/filter.h
View file @
38c34498
...
@@ -32,7 +32,7 @@ typedef enum {
...
@@ -32,7 +32,7 @@ typedef enum {
GIT_FILTER_TO_WORKTREE
=
0
,
GIT_FILTER_TO_WORKTREE
=
0
,
GIT_FILTER_SMUDGE
=
GIT_FILTER_TO_WORKTREE
,
GIT_FILTER_SMUDGE
=
GIT_FILTER_TO_WORKTREE
,
GIT_FILTER_TO_ODB
=
1
,
GIT_FILTER_TO_ODB
=
1
,
GIT_FILTER_CLEAN
=
GIT_FILTER_TO_ODB
,
GIT_FILTER_CLEAN
=
GIT_FILTER_TO_ODB
}
git_filter_mode_t
;
}
git_filter_mode_t
;
/**
/**
...
@@ -54,7 +54,7 @@ typedef enum {
...
@@ -54,7 +54,7 @@ typedef enum {
* Load attributes from `.gitattributes` in a given commit.
* Load attributes from `.gitattributes` in a given commit.
* This can only be specified in a `git_filter_options`.
* This can only be specified in a `git_filter_options`.
*/
*/
GIT_FILTER_ATTRIBUTES_FROM_COMMIT
=
(
1u
<<
3
)
,
GIT_FILTER_ATTRIBUTES_FROM_COMMIT
=
(
1u
<<
3
)
}
git_filter_flag_t
;
}
git_filter_flag_t
;
/**
/**
...
...
include/git2/index.h
View file @
38c34498
...
@@ -86,7 +86,7 @@ typedef struct git_index_entry {
...
@@ -86,7 +86,7 @@ typedef struct git_index_entry {
*/
*/
typedef
enum
{
typedef
enum
{
GIT_INDEX_ENTRY_EXTENDED
=
(
0x4000
),
GIT_INDEX_ENTRY_EXTENDED
=
(
0x4000
),
GIT_INDEX_ENTRY_VALID
=
(
0x8000
)
,
GIT_INDEX_ENTRY_VALID
=
(
0x8000
)
}
git_index_entry_flag_t
;
}
git_index_entry_flag_t
;
#define GIT_INDEX_ENTRY_STAGE(E) \
#define GIT_INDEX_ENTRY_STAGE(E) \
...
@@ -119,7 +119,7 @@ typedef enum {
...
@@ -119,7 +119,7 @@ typedef enum {
GIT_INDEX_ENTRY_EXTENDED_FLAGS
=
(
GIT_INDEX_ENTRY_INTENT_TO_ADD
|
GIT_INDEX_ENTRY_SKIP_WORKTREE
),
GIT_INDEX_ENTRY_EXTENDED_FLAGS
=
(
GIT_INDEX_ENTRY_INTENT_TO_ADD
|
GIT_INDEX_ENTRY_SKIP_WORKTREE
),
GIT_INDEX_ENTRY_UPTODATE
=
(
1
<<
2
)
,
GIT_INDEX_ENTRY_UPTODATE
=
(
1
<<
2
)
}
git_index_entry_extended_flag_t
;
}
git_index_entry_extended_flag_t
;
/** Capabilities of system that affect index actions. */
/** Capabilities of system that affect index actions. */
...
@@ -127,7 +127,7 @@ typedef enum {
...
@@ -127,7 +127,7 @@ typedef enum {
GIT_INDEX_CAPABILITY_IGNORE_CASE
=
1
,
GIT_INDEX_CAPABILITY_IGNORE_CASE
=
1
,
GIT_INDEX_CAPABILITY_NO_FILEMODE
=
2
,
GIT_INDEX_CAPABILITY_NO_FILEMODE
=
2
,
GIT_INDEX_CAPABILITY_NO_SYMLINKS
=
4
,
GIT_INDEX_CAPABILITY_NO_SYMLINKS
=
4
,
GIT_INDEX_CAPABILITY_FROM_OWNER
=
-
1
,
GIT_INDEX_CAPABILITY_FROM_OWNER
=
-
1
}
git_index_capability_t
;
}
git_index_capability_t
;
...
@@ -140,7 +140,7 @@ typedef enum {
...
@@ -140,7 +140,7 @@ typedef enum {
GIT_INDEX_ADD_DEFAULT
=
0
,
GIT_INDEX_ADD_DEFAULT
=
0
,
GIT_INDEX_ADD_FORCE
=
(
1u
<<
0
),
GIT_INDEX_ADD_FORCE
=
(
1u
<<
0
),
GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH
=
(
1u
<<
1
),
GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH
=
(
1u
<<
1
),
GIT_INDEX_ADD_CHECK_PATHSPEC
=
(
1u
<<
2
)
,
GIT_INDEX_ADD_CHECK_PATHSPEC
=
(
1u
<<
2
)
}
git_index_add_option_t
;
}
git_index_add_option_t
;
/** Git index stage states */
/** Git index stage states */
...
@@ -163,7 +163,7 @@ typedef enum {
...
@@ -163,7 +163,7 @@ typedef enum {
GIT_INDEX_STAGE_OURS
=
2
,
GIT_INDEX_STAGE_OURS
=
2
,
/** The "theirs" side of a conflict. */
/** The "theirs" side of a conflict. */
GIT_INDEX_STAGE_THEIRS
=
3
,
GIT_INDEX_STAGE_THEIRS
=
3
}
git_index_stage_t
;
}
git_index_stage_t
;
/**
/**
...
...
include/git2/merge.h
View file @
38c34498
...
@@ -91,7 +91,7 @@ typedef enum {
...
@@ -91,7 +91,7 @@ typedef enum {
* instead simply use the first base. This flag provides a similar
* instead simply use the first base. This flag provides a similar
* merge base to `git-merge-resolve`.
* merge base to `git-merge-resolve`.
*/
*/
GIT_MERGE_NO_RECURSIVE
=
(
1
<<
3
)
,
GIT_MERGE_NO_RECURSIVE
=
(
1
<<
3
)
}
git_merge_flag_t
;
}
git_merge_flag_t
;
/**
/**
...
@@ -127,7 +127,7 @@ typedef enum {
...
@@ -127,7 +127,7 @@ typedef enum {
* which has the result of combining both files. The index will not
* which has the result of combining both files. The index will not
* record a conflict.
* record a conflict.
*/
*/
GIT_MERGE_FILE_FAVOR_UNION
=
3
,
GIT_MERGE_FILE_FAVOR_UNION
=
3
}
git_merge_file_favor_t
;
}
git_merge_file_favor_t
;
/**
/**
...
@@ -159,7 +159,7 @@ typedef enum {
...
@@ -159,7 +159,7 @@ typedef enum {
GIT_MERGE_FILE_DIFF_PATIENCE
=
(
1
<<
6
),
GIT_MERGE_FILE_DIFF_PATIENCE
=
(
1
<<
6
),
/** Take extra time to find minimal diff */
/** Take extra time to find minimal diff */
GIT_MERGE_FILE_DIFF_MINIMAL
=
(
1
<<
7
)
,
GIT_MERGE_FILE_DIFF_MINIMAL
=
(
1
<<
7
)
}
git_merge_file_flag_t
;
}
git_merge_file_flag_t
;
#define GIT_MERGE_CONFLICT_MARKER_SIZE 7
#define GIT_MERGE_CONFLICT_MARKER_SIZE 7
...
@@ -341,7 +341,7 @@ typedef enum {
...
@@ -341,7 +341,7 @@ typedef enum {
* a valid commit. No merge can be performed, but the caller may wish
* a valid commit. No merge can be performed, but the caller may wish
* to simply set HEAD to the target commit(s).
* to simply set HEAD to the target commit(s).
*/
*/
GIT_MERGE_ANALYSIS_UNBORN
=
(
1
<<
3
)
,
GIT_MERGE_ANALYSIS_UNBORN
=
(
1
<<
3
)
}
git_merge_analysis_t
;
}
git_merge_analysis_t
;
/**
/**
...
@@ -364,7 +364,7 @@ typedef enum {
...
@@ -364,7 +364,7 @@ typedef enum {
* There is a `merge.ff=only` configuration setting, suggesting that
* There is a `merge.ff=only` configuration setting, suggesting that
* the user only wants fast-forward merges.
* the user only wants fast-forward merges.
*/
*/
GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY
=
(
1
<<
1
)
,
GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY
=
(
1
<<
1
)
}
git_merge_preference_t
;
}
git_merge_preference_t
;
/**
/**
...
...
include/git2/odb_backend.h
View file @
38c34498
...
@@ -71,7 +71,7 @@ GIT_EXTERN(int) git_odb_backend_one_pack(git_odb_backend **out, const char *inde
...
@@ -71,7 +71,7 @@ GIT_EXTERN(int) git_odb_backend_one_pack(git_odb_backend **out, const char *inde
typedef
enum
{
typedef
enum
{
GIT_STREAM_RDONLY
=
(
1
<<
1
),
GIT_STREAM_RDONLY
=
(
1
<<
1
),
GIT_STREAM_WRONLY
=
(
1
<<
2
),
GIT_STREAM_WRONLY
=
(
1
<<
2
),
GIT_STREAM_RW
=
(
GIT_STREAM_RDONLY
|
GIT_STREAM_WRONLY
)
,
GIT_STREAM_RW
=
(
GIT_STREAM_RDONLY
|
GIT_STREAM_WRONLY
)
}
git_odb_stream_t
;
}
git_odb_stream_t
;
/**
/**
...
...
include/git2/pack.h
View file @
38c34498
...
@@ -51,7 +51,7 @@ GIT_BEGIN_DECL
...
@@ -51,7 +51,7 @@ GIT_BEGIN_DECL
*/
*/
typedef
enum
{
typedef
enum
{
GIT_PACKBUILDER_ADDING_OBJECTS
=
0
,
GIT_PACKBUILDER_ADDING_OBJECTS
=
0
,
GIT_PACKBUILDER_DELTAFICATION
=
1
,
GIT_PACKBUILDER_DELTAFICATION
=
1
}
git_packbuilder_stage_t
;
}
git_packbuilder_stage_t
;
/**
/**
...
...
include/git2/pathspec.h
View file @
38c34498
...
@@ -69,7 +69,7 @@ typedef enum {
...
@@ -69,7 +69,7 @@ typedef enum {
* just test if there were any matches at all or in combination with
* just test if there were any matches at all or in combination with
* GIT_PATHSPEC_FIND_FAILURES to validate a pathspec.
* GIT_PATHSPEC_FIND_FAILURES to validate a pathspec.
*/
*/
GIT_PATHSPEC_FAILURES_ONLY
=
(
1u
<<
5
)
,
GIT_PATHSPEC_FAILURES_ONLY
=
(
1u
<<
5
)
}
git_pathspec_flag_t
;
}
git_pathspec_flag_t
;
/**
/**
...
...
include/git2/proxy.h
View file @
38c34498
...
@@ -32,7 +32,7 @@ typedef enum {
...
@@ -32,7 +32,7 @@ typedef enum {
/**
/**
* Connect via the URL given in the options
* Connect via the URL given in the options
*/
*/
GIT_PROXY_SPECIFIED
,
GIT_PROXY_SPECIFIED
}
git_proxy_t
;
}
git_proxy_t
;
/**
/**
...
...
include/git2/rebase.h
View file @
38c34498
...
@@ -152,7 +152,7 @@ typedef enum {
...
@@ -152,7 +152,7 @@ typedef enum {
* No commit will be cherry-picked. The client should run the given
* No commit will be cherry-picked. The client should run the given
* command and (if successful) continue.
* command and (if successful) continue.
*/
*/
GIT_REBASE_OPERATION_EXEC
,
GIT_REBASE_OPERATION_EXEC
}
git_rebase_operation_t
;
}
git_rebase_operation_t
;
#define GIT_REBASE_OPTIONS_VERSION 1
#define GIT_REBASE_OPTIONS_VERSION 1
...
...
include/git2/refs.h
View file @
38c34498
...
@@ -686,7 +686,7 @@ typedef enum {
...
@@ -686,7 +686,7 @@ typedef enum {
* so the `ONELEVEL` naming rules aren't enforced and 'master'
* so the `ONELEVEL` naming rules aren't enforced and 'master'
* becomes a valid name.
* becomes a valid name.
*/
*/
GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND
=
(
1u
<<
2
)
,
GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND
=
(
1u
<<
2
)
}
git_reference_format_t
;
}
git_reference_format_t
;
/**
/**
...
...
include/git2/remote.h
View file @
38c34498
...
@@ -49,7 +49,7 @@ typedef enum {
...
@@ -49,7 +49,7 @@ typedef enum {
GIT_REMOTE_CREATE_SKIP_INSTEADOF
=
(
1
<<
0
),
GIT_REMOTE_CREATE_SKIP_INSTEADOF
=
(
1
<<
0
),
/** Don't build a fetchspec from the name if none is set */
/** Don't build a fetchspec from the name if none is set */
GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC
=
(
1
<<
1
)
,
GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC
=
(
1
<<
1
)
}
git_remote_create_flags
;
}
git_remote_create_flags
;
/**
/**
...
@@ -443,7 +443,7 @@ GIT_EXTERN(int) git_remote_list(git_strarray *out, git_repository *repo);
...
@@ -443,7 +443,7 @@ GIT_EXTERN(int) git_remote_list(git_strarray *out, git_repository *repo);
typedef
enum
git_remote_completion_t
{
typedef
enum
git_remote_completion_t
{
GIT_REMOTE_COMPLETION_DOWNLOAD
,
GIT_REMOTE_COMPLETION_DOWNLOAD
,
GIT_REMOTE_COMPLETION_INDEXING
,
GIT_REMOTE_COMPLETION_INDEXING
,
GIT_REMOTE_COMPLETION_ERROR
,
GIT_REMOTE_COMPLETION_ERROR
}
git_remote_completion_t
;
}
git_remote_completion_t
;
/** Push network progress notification function */
/** Push network progress notification function */
...
@@ -665,7 +665,7 @@ typedef enum {
...
@@ -665,7 +665,7 @@ typedef enum {
/**
/**
* Force pruning off
* Force pruning off
*/
*/
GIT_FETCH_NO_PRUNE
,
GIT_FETCH_NO_PRUNE
}
git_fetch_prune_t
;
}
git_fetch_prune_t
;
/**
/**
...
@@ -690,7 +690,7 @@ typedef enum {
...
@@ -690,7 +690,7 @@ typedef enum {
/**
/**
* Ask for the all the tags.
* Ask for the all the tags.
*/
*/
GIT_REMOTE_DOWNLOAD_TAGS_ALL
,
GIT_REMOTE_DOWNLOAD_TAGS_ALL
}
git_remote_autotag_option_t
;
}
git_remote_autotag_option_t
;
/**
/**
...
...
include/git2/repository.h
View file @
38c34498
...
@@ -141,7 +141,7 @@ typedef enum {
...
@@ -141,7 +141,7 @@ typedef enum {
* `git_repository_open_ext` with this flag will error out if either
* `git_repository_open_ext` with this flag will error out if either
* $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
* $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
*/
*/
GIT_REPOSITORY_OPEN_FROM_ENV
=
(
1
<<
4
)
,
GIT_REPOSITORY_OPEN_FROM_ENV
=
(
1
<<
4
)
}
git_repository_open_flag_t
;
}
git_repository_open_flag_t
;
/**
/**
...
@@ -267,7 +267,7 @@ typedef enum {
...
@@ -267,7 +267,7 @@ typedef enum {
* If an alternate workdir is specified, use relative paths for the gitdir
* If an alternate workdir is specified, use relative paths for the gitdir
* and core.worktree.
* and core.worktree.
*/
*/
GIT_REPOSITORY_INIT_RELATIVE_GITLINK
=
(
1u
<<
6
)
,
GIT_REPOSITORY_INIT_RELATIVE_GITLINK
=
(
1u
<<
6
)
}
git_repository_init_flag_t
;
}
git_repository_init_flag_t
;
/**
/**
...
@@ -292,7 +292,7 @@ typedef enum {
...
@@ -292,7 +292,7 @@ typedef enum {
/**
/**
* Use "--shared=all" behavior, adding world readability.
* Use "--shared=all" behavior, adding world readability.
*/
*/
GIT_REPOSITORY_INIT_SHARED_ALL
=
0002777
,
GIT_REPOSITORY_INIT_SHARED_ALL
=
0002777
}
git_repository_init_mode_t
;
}
git_repository_init_mode_t
;
/**
/**
...
@@ -876,7 +876,7 @@ typedef enum {
...
@@ -876,7 +876,7 @@ typedef enum {
GIT_REPOSITORY_STATE_REBASE_INTERACTIVE
,
GIT_REPOSITORY_STATE_REBASE_INTERACTIVE
,
GIT_REPOSITORY_STATE_REBASE_MERGE
,
GIT_REPOSITORY_STATE_REBASE_MERGE
,
GIT_REPOSITORY_STATE_APPLY_MAILBOX
,
GIT_REPOSITORY_STATE_APPLY_MAILBOX
,
GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE
,
GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE
}
git_repository_state_t
;
}
git_repository_state_t
;
/**
/**
...
...
include/git2/reset.h
View file @
38c34498
...
@@ -26,7 +26,7 @@ GIT_BEGIN_DECL
...
@@ -26,7 +26,7 @@ GIT_BEGIN_DECL
typedef
enum
{
typedef
enum
{
GIT_RESET_SOFT
=
1
,
/**< Move the head to the given commit */
GIT_RESET_SOFT
=
1
,
/**< Move the head to the given commit */
GIT_RESET_MIXED
=
2
,
/**< SOFT plus reset index to the commit */
GIT_RESET_MIXED
=
2
,
/**< SOFT plus reset index to the commit */
GIT_RESET_HARD
=
3
,
/**< MIXED plus changes in working tree discarded */
GIT_RESET_HARD
=
3
/**< MIXED plus changes in working tree discarded */
}
git_reset_t
;
}
git_reset_t
;
/**
/**
...
...
include/git2/revparse.h
View file @
38c34498
...
@@ -74,7 +74,7 @@ typedef enum {
...
@@ -74,7 +74,7 @@ typedef enum {
/** The spec targeted a range of commits. */
/** The spec targeted a range of commits. */
GIT_REVSPEC_RANGE
=
1
<<
1
,
GIT_REVSPEC_RANGE
=
1
<<
1
,
/** The spec used the '...' operator, which invokes special semantics. */
/** The spec used the '...' operator, which invokes special semantics. */
GIT_REVSPEC_MERGE_BASE
=
1
<<
2
,
GIT_REVSPEC_MERGE_BASE
=
1
<<
2
}
git_revspec_t
;
}
git_revspec_t
;
/**
/**
...
...
include/git2/revwalk.h
View file @
38c34498
...
@@ -49,7 +49,7 @@ typedef enum {
...
@@ -49,7 +49,7 @@ typedef enum {
* order; this sorting mode can be combined with
* order; this sorting mode can be combined with
* any of the above.
* any of the above.
*/
*/
GIT_SORT_REVERSE
=
1
<<
2
,
GIT_SORT_REVERSE
=
1
<<
2
}
git_sort_t
;
}
git_sort_t
;
/**
/**
...
...
include/git2/stash.h
View file @
38c34498
...
@@ -44,7 +44,7 @@ typedef enum {
...
@@ -44,7 +44,7 @@ typedef enum {
* All ignored files are also stashed and then cleaned up from
* All ignored files are also stashed and then cleaned up from
* the working directory
* the working directory
*/
*/
GIT_STASH_INCLUDE_IGNORED
=
(
1
<<
2
)
,
GIT_STASH_INCLUDE_IGNORED
=
(
1
<<
2
)
}
git_stash_flags
;
}
git_stash_flags
;
/**
/**
...
@@ -78,7 +78,7 @@ typedef enum {
...
@@ -78,7 +78,7 @@ typedef enum {
/* Try to reinstate not only the working tree's changes,
/* Try to reinstate not only the working tree's changes,
* but also the index's changes.
* but also the index's changes.
*/
*/
GIT_STASH_APPLY_REINSTATE_INDEX
=
(
1
<<
0
)
,
GIT_STASH_APPLY_REINSTATE_INDEX
=
(
1
<<
0
)
}
git_stash_apply_flags
;
}
git_stash_apply_flags
;
/** Stash apply progression states */
/** Stash apply progression states */
...
@@ -104,7 +104,7 @@ typedef enum {
...
@@ -104,7 +104,7 @@ typedef enum {
GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED
,
GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED
,
/** The stash was applied successfully. */
/** The stash was applied successfully. */
GIT_STASH_APPLY_PROGRESS_DONE
,
GIT_STASH_APPLY_PROGRESS_DONE
}
git_stash_apply_progress_t
;
}
git_stash_apply_progress_t
;
/**
/**
...
...
include/git2/status.h
View file @
38c34498
...
@@ -48,7 +48,7 @@ typedef enum {
...
@@ -48,7 +48,7 @@ typedef enum {
GIT_STATUS_WT_UNREADABLE
=
(
1u
<<
12
),
GIT_STATUS_WT_UNREADABLE
=
(
1u
<<
12
),
GIT_STATUS_IGNORED
=
(
1u
<<
14
),
GIT_STATUS_IGNORED
=
(
1u
<<
14
),
GIT_STATUS_CONFLICTED
=
(
1u
<<
15
)
,
GIT_STATUS_CONFLICTED
=
(
1u
<<
15
)
}
git_status_t
;
}
git_status_t
;
/**
/**
...
@@ -87,7 +87,7 @@ typedef enum {
...
@@ -87,7 +87,7 @@ typedef enum {
* Only gives status based on index to working directory comparison,
* Only gives status based on index to working directory comparison,
* not comparing the index to the HEAD.
* not comparing the index to the HEAD.
*/
*/
GIT_STATUS_SHOW_WORKDIR_ONLY
=
2
,
GIT_STATUS_SHOW_WORKDIR_ONLY
=
2
}
git_status_show_t
;
}
git_status_show_t
;
/**
/**
...
@@ -204,7 +204,7 @@ typedef enum {
...
@@ -204,7 +204,7 @@ typedef enum {
* Unreadable files will be detected and given the status
* Unreadable files will be detected and given the status
* untracked instead of unreadable.
* untracked instead of unreadable.
*/
*/
GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED
=
(
1u
<<
15
)
,
GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED
=
(
1u
<<
15
)
}
git_status_opt_t
;
}
git_status_opt_t
;
#define GIT_STATUS_OPT_DEFAULTS \
#define GIT_STATUS_OPT_DEFAULTS \
...
...
include/git2/submodule.h
View file @
38c34498
...
@@ -85,7 +85,7 @@ typedef enum {
...
@@ -85,7 +85,7 @@ typedef enum {
GIT_SUBMODULE_STATUS_WD_MODIFIED
=
(
1u
<<
10
),
GIT_SUBMODULE_STATUS_WD_MODIFIED
=
(
1u
<<
10
),
GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED
=
(
1u
<<
11
),
GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED
=
(
1u
<<
11
),
GIT_SUBMODULE_STATUS_WD_WD_MODIFIED
=
(
1u
<<
12
),
GIT_SUBMODULE_STATUS_WD_WD_MODIFIED
=
(
1u
<<
12
),
GIT_SUBMODULE_STATUS_WD_UNTRACKED
=
(
1u
<<
13
)
,
GIT_SUBMODULE_STATUS_WD_UNTRACKED
=
(
1u
<<
13
)
}
git_submodule_status_t
;
}
git_submodule_status_t
;
#define GIT_SUBMODULE_STATUS__IN_FLAGS 0x000Fu
#define GIT_SUBMODULE_STATUS__IN_FLAGS 0x000Fu
...
...
include/git2/sys/commit_graph.h
View file @
38c34498
...
@@ -94,7 +94,7 @@ typedef enum {
...
@@ -94,7 +94,7 @@ typedef enum {
* Do not split commit-graph files. The other split strategy-related option
* Do not split commit-graph files. The other split strategy-related option
* fields are ignored.
* fields are ignored.
*/
*/
GIT_COMMIT_GRAPH_SPLIT_STRATEGY_SINGLE_FILE
=
0
,
GIT_COMMIT_GRAPH_SPLIT_STRATEGY_SINGLE_FILE
=
0
}
git_commit_graph_split_strategy_t
;
}
git_commit_graph_split_strategy_t
;
/**
/**
...
...
include/git2/sys/stream.h
View file @
38c34498
...
@@ -79,7 +79,7 @@ typedef enum {
...
@@ -79,7 +79,7 @@ typedef enum {
GIT_STREAM_STANDARD
=
1
,
GIT_STREAM_STANDARD
=
1
,
/** A TLS-encrypted socket. */
/** A TLS-encrypted socket. */
GIT_STREAM_TLS
=
2
,
GIT_STREAM_TLS
=
2
}
git_stream_t
;
}
git_stream_t
;
/**
/**
...
...
include/git2/sys/transport.h
View file @
38c34498
...
@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
...
@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
* Currently unused.
* Currently unused.
*/
*/
typedef
enum
{
typedef
enum
{
GIT_TRANSPORTFLAGS_NONE
=
0
,
GIT_TRANSPORTFLAGS_NONE
=
0
}
git_transport_flags_t
;
}
git_transport_flags_t
;
struct
git_transport
{
struct
git_transport
{
...
@@ -289,7 +289,7 @@ typedef enum {
...
@@ -289,7 +289,7 @@ typedef enum {
GIT_SERVICE_UPLOADPACK_LS
=
1
,
GIT_SERVICE_UPLOADPACK_LS
=
1
,
GIT_SERVICE_UPLOADPACK
=
2
,
GIT_SERVICE_UPLOADPACK
=
2
,
GIT_SERVICE_RECEIVEPACK_LS
=
3
,
GIT_SERVICE_RECEIVEPACK_LS
=
3
,
GIT_SERVICE_RECEIVEPACK
=
4
,
GIT_SERVICE_RECEIVEPACK
=
4
}
git_smart_service_t
;
}
git_smart_service_t
;
typedef
struct
git_smart_subtransport
git_smart_subtransport
;
typedef
struct
git_smart_subtransport
git_smart_subtransport
;
...
...
include/git2/tree.h
View file @
38c34498
...
@@ -386,7 +386,7 @@ typedef int GIT_CALLBACK(git_treewalk_cb)(
...
@@ -386,7 +386,7 @@ typedef int GIT_CALLBACK(git_treewalk_cb)(
/** Tree traversal modes */
/** Tree traversal modes */
typedef
enum
{
typedef
enum
{
GIT_TREEWALK_PRE
=
0
,
/* Pre-order */
GIT_TREEWALK_PRE
=
0
,
/* Pre-order */
GIT_TREEWALK_POST
=
1
,
/* Post-order */
GIT_TREEWALK_POST
=
1
/* Post-order */
}
git_treewalk_mode
;
}
git_treewalk_mode
;
/**
/**
...
@@ -428,7 +428,7 @@ typedef enum {
...
@@ -428,7 +428,7 @@ typedef enum {
/** Update or insert an entry at the specified path */
/** Update or insert an entry at the specified path */
GIT_TREE_UPDATE_UPSERT
,
GIT_TREE_UPDATE_UPSERT
,
/** Remove an entry from the specified path */
/** Remove an entry from the specified path */
GIT_TREE_UPDATE_REMOVE
,
GIT_TREE_UPDATE_REMOVE
}
git_tree_update_t
;
}
git_tree_update_t
;
/**
/**
...
...
include/git2/types.h
View file @
38c34498
...
@@ -78,7 +78,7 @@ typedef enum {
...
@@ -78,7 +78,7 @@ typedef enum {
GIT_OBJECT_BLOB
=
3
,
/**< A file revision object. */
GIT_OBJECT_BLOB
=
3
,
/**< A file revision object. */
GIT_OBJECT_TAG
=
4
,
/**< An annotated tag object. */
GIT_OBJECT_TAG
=
4
,
/**< An annotated tag object. */
GIT_OBJECT_OFS_DELTA
=
6
,
/**< A delta, base is given by an offset. */
GIT_OBJECT_OFS_DELTA
=
6
,
/**< A delta, base is given by an offset. */
GIT_OBJECT_REF_DELTA
=
7
,
/**< A delta, base is given by object id. */
GIT_OBJECT_REF_DELTA
=
7
/**< A delta, base is given by object id. */
}
git_object_t
;
}
git_object_t
;
/** An open object database handle. */
/** An open object database handle. */
...
@@ -208,14 +208,14 @@ typedef enum {
...
@@ -208,14 +208,14 @@ typedef enum {
GIT_REFERENCE_INVALID
=
0
,
/**< Invalid reference */
GIT_REFERENCE_INVALID
=
0
,
/**< Invalid reference */
GIT_REFERENCE_DIRECT
=
1
,
/**< A reference that points at an object id */
GIT_REFERENCE_DIRECT
=
1
,
/**< A reference that points at an object id */
GIT_REFERENCE_SYMBOLIC
=
2
,
/**< A reference that points at another reference */
GIT_REFERENCE_SYMBOLIC
=
2
,
/**< A reference that points at another reference */
GIT_REFERENCE_ALL
=
GIT_REFERENCE_DIRECT
|
GIT_REFERENCE_SYMBOLIC
,
GIT_REFERENCE_ALL
=
GIT_REFERENCE_DIRECT
|
GIT_REFERENCE_SYMBOLIC
}
git_reference_t
;
}
git_reference_t
;
/** Basic type of any Git branch. */
/** Basic type of any Git branch. */
typedef
enum
{
typedef
enum
{
GIT_BRANCH_LOCAL
=
1
,
GIT_BRANCH_LOCAL
=
1
,
GIT_BRANCH_REMOTE
=
2
,
GIT_BRANCH_REMOTE
=
2
,
GIT_BRANCH_ALL
=
GIT_BRANCH_LOCAL
|
GIT_BRANCH_REMOTE
,
GIT_BRANCH_ALL
=
GIT_BRANCH_LOCAL
|
GIT_BRANCH_REMOTE
}
git_branch_t
;
}
git_branch_t
;
/** Valid modes for index and tree entries. */
/** Valid modes for index and tree entries. */
...
@@ -225,7 +225,7 @@ typedef enum {
...
@@ -225,7 +225,7 @@ typedef enum {
GIT_FILEMODE_BLOB
=
0100644
,
GIT_FILEMODE_BLOB
=
0100644
,
GIT_FILEMODE_BLOB_EXECUTABLE
=
0100755
,
GIT_FILEMODE_BLOB_EXECUTABLE
=
0100755
,
GIT_FILEMODE_LINK
=
0120000
,
GIT_FILEMODE_LINK
=
0120000
,
GIT_FILEMODE_COMMIT
=
0160000
,
GIT_FILEMODE_COMMIT
=
0160000
}
git_filemode_t
;
}
git_filemode_t
;
/**
/**
...
@@ -334,7 +334,7 @@ typedef enum {
...
@@ -334,7 +334,7 @@ typedef enum {
GIT_SUBMODULE_IGNORE_NONE
=
1
,
/**< any change or untracked == dirty */
GIT_SUBMODULE_IGNORE_NONE
=
1
,
/**< any change or untracked == dirty */
GIT_SUBMODULE_IGNORE_UNTRACKED
=
2
,
/**< dirty if tracked files change */
GIT_SUBMODULE_IGNORE_UNTRACKED
=
2
,
/**< dirty if tracked files change */
GIT_SUBMODULE_IGNORE_DIRTY
=
3
,
/**< only dirty if HEAD moved */
GIT_SUBMODULE_IGNORE_DIRTY
=
3
,
/**< only dirty if HEAD moved */
GIT_SUBMODULE_IGNORE_ALL
=
4
,
/**< never dirty */
GIT_SUBMODULE_IGNORE_ALL
=
4
/**< never dirty */
}
git_submodule_ignore_t
;
}
git_submodule_ignore_t
;
/**
/**
...
@@ -350,7 +350,7 @@ typedef enum {
...
@@ -350,7 +350,7 @@ typedef enum {
typedef
enum
{
typedef
enum
{
GIT_SUBMODULE_RECURSE_NO
=
0
,
GIT_SUBMODULE_RECURSE_NO
=
0
,
GIT_SUBMODULE_RECURSE_YES
=
1
,
GIT_SUBMODULE_RECURSE_YES
=
1
,
GIT_SUBMODULE_RECURSE_ONDEMAND
=
2
,
GIT_SUBMODULE_RECURSE_ONDEMAND
=
2
}
git_submodule_recurse_t
;
}
git_submodule_recurse_t
;
typedef
struct
git_writestream
git_writestream
;
typedef
struct
git_writestream
git_writestream
;
...
...
include/git2/worktree.h
View file @
38c34498
...
@@ -185,7 +185,7 @@ typedef enum {
...
@@ -185,7 +185,7 @@ typedef enum {
/* Prune working tree even if it is locked */
/* Prune working tree even if it is locked */
GIT_WORKTREE_PRUNE_LOCKED
=
1u
<<
1
,
GIT_WORKTREE_PRUNE_LOCKED
=
1u
<<
1
,
/* Prune checked out working tree */
/* Prune checked out working tree */
GIT_WORKTREE_PRUNE_WORKING_TREE
=
1u
<<
2
,
GIT_WORKTREE_PRUNE_WORKING_TREE
=
1u
<<
2
}
git_worktree_prune_t
;
}
git_worktree_prune_t
;
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment