diff --git a/.gitignore b/.gitignore index 30f7dbc25..99a83fc4a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ *.log .DS_STORE .idea +.clangd .vscode jsconfig.json diff --git a/generate/input/callbacks.json b/generate/input/callbacks.json index e1cf6d828..aa0842995 100644 --- a/generate/input/callbacks.json +++ b/generate/input/callbacks.json @@ -135,20 +135,41 @@ "throttle": 100 } }, - "git_commit_signing_cb": { + "git_commit_create_cb": { "args": [ { - "name": "signature", - "cType": "git_buf *" + "name": "out", + "cType": "git_oid *", + "isReturn": true }, { - "name": "signature_field", - "cType": "git_buf *" + "name": "author", + "cType": "const git_signature *" + }, + { + "name": "committer", + "cType": "const git_signature *" + }, + { + "name": "message_encoding", + "cType": "const char *" }, { - "name": "commit_content", + "name": "message", "cType": "const char *" }, + { + "name": "tree", + "cType": "const git_tree *" + }, + { + "name": "parent_count", + "cType": "size_t" + }, + { + "name": "parents", + "cType": "const git_oid * []" + }, { "name": "payload", "cType": "void *" @@ -627,6 +648,27 @@ "cancel": -1 } }, + "git_remote_ready_cb": { + "args": [ + { + "name": "remote", + "cType": "git_remote *" + }, + { + "name": "direction", + "cType": "int" + }, + { + "name": "payload", + "cType": "void *" + } + ], + "return": { + "type": "int", + "success": 0, + "error": -1 + } + }, "git_repository_create_cb": { "args": [ { diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index a5e8448d1..bf0efcd0a 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1667,6 +1667,20 @@ "return": { "isResultOrError": true } + }, + "git_graph_reachable_from_any": { + "args": { + "descendant_array": { + "cType": "git_oid *", + "cppClassName": "Array", + "jsClassName": "Array", + "arrayElementCppClassName": "GitOid" + } + }, + "isAsync": true, + "return": { + "isResultOrError": true + } } } }, @@ -3091,6 +3105,57 @@ } } }, + "rebase_options": { + "fields": { + "signing_cb": { + "ignore": true + }, + "commit_create_cb": { + "args": [ + { + "name": "out", + "cType": "git_oid *" + }, + { + "name": "author", + "cType": "const git_signature *" + }, + { + "name": "committer", + "cType": "const git_signature *" + }, + { + "name": "message_encoding", + "cType": "const char *" + }, + { + "name": "message", + "cType": "const char *" + }, + { + "name": "tree", + "cType": "const git_tree *" + }, + { + "name": "parent_count", + "cType": "size_t" + }, + { + "name": "parents", + "cType": "const git_oid **", + "cppClassName": "Array", + "jsClassName": "Array", + "arrayElementCppClassName": "GitOid", + "arrayLengthArgumentName": "parent_count" + }, + { + "name": "payload", + "cType": "void *" + } + ] + } + } + }, "refdb": { "selfFreeing": true, "functions": { diff --git a/generate/input/libgit2-docs.json b/generate/input/libgit2-docs.json index e9f259a71..5bd855577 100644 --- a/generate/input/libgit2-docs.json +++ b/generate/input/libgit2-docs.json @@ -23,21 +23,24 @@ "git_apply" ], "meta": {}, - "lines": 145 + "lines": 147 }, { "file": "git2/attr.h", "functions": [ "git_attr_value", "git_attr_get", + "git_attr_get_ext", "git_attr_get_many", + "git_attr_get_many_ext", "git_attr_foreach_cb", "git_attr_foreach", + "git_attr_foreach_ext", "git_attr_cache_flush", "git_attr_add_macro" ], "meta": {}, - "lines": 261 + "lines": 356 }, { "file": "git2/blame.h", @@ -51,7 +54,7 @@ "git_blame_free" ], "meta": {}, - "lines": 226 + "lines": 277 }, { "file": "git2/blob.h", @@ -74,7 +77,7 @@ "git_blob_dup" ], "meta": {}, - "lines": 276 + "lines": 294 }, { "file": "git2/branch.h", @@ -95,10 +98,11 @@ "git_branch_is_checked_out", "git_branch_remote_name", "git_branch_upstream_remote", + "git_branch_upstream_merge", "git_branch_name_is_valid" ], "meta": {}, - "lines": 317 + "lines": 330 }, { "file": "git2/buffer.h", @@ -118,7 +122,7 @@ "git_transport_certificate_check_cb" ], "meta": {}, - "lines": 167 + "lines": 168 }, { "file": "git2/checkout.h", @@ -132,7 +136,7 @@ "git_checkout_tree" ], "meta": {}, - "lines": 394 + "lines": 410 }, { "file": "git2/cherrypick.h", @@ -189,10 +193,10 @@ "git_commit_create_buffer", "git_commit_create_with_signature", "git_commit_dup", - "git_commit_signing_cb" + "git_commit_create_cb" ], "meta": {}, - "lines": 524 + "lines": 540 }, { "file": "git2/common.h", @@ -202,7 +206,7 @@ "git_libgit2_opts" ], "meta": {}, - "lines": 423 + "lines": 456 }, { "file": "git2/config.h", @@ -286,8 +290,18 @@ "file": "git2/deprecated.h", "functions": [ "git_blob_filtered_content", + "git_filter_list_stream_data", + "git_filter_list_apply_to_data", "git_treebuilder_write_with_buffer", + "git_buf_grow", + "git_buf_set", + "git_buf_is_binary", + "git_buf_contains_nul", "git_buf_free", + "git_commit_signing_cb", + "git_diff_format_email", + "git_diff_commit_as_email", + "git_diff_format_email_options_init", "giterr_last", "giterr_clear", "giterr_set_str", @@ -296,13 +310,14 @@ "git_remote_is_valid_name", "git_reference_is_valid_name", "git_oid_iszero", + "git_oidarray_free", "git_headlist_cb", "git_strarray_copy", "git_strarray_free", "git_blame_init_options" ], "meta": {}, - "lines": 667 + "lines": 897 }, { "file": "git2/describe.h", @@ -355,14 +370,17 @@ "git_diff_stats_deletions", "git_diff_stats_to_buf", "git_diff_stats_free", - "git_diff_format_email", - "git_diff_commit_as_email", - "git_diff_format_email_options_init", "git_diff_patchid_options_init", "git_diff_patchid" ], "meta": {}, - "lines": 1504 + "lines": 1425 + }, + { + "file": "git2/email.h", + "functions": [], + "meta": {}, + "lines": 38 }, { "file": "git2/errors.h", @@ -379,17 +397,18 @@ "file": "git2/filter.h", "functions": [ "git_filter_list_load", + "git_filter_list_load_ext", "git_filter_list_contains", - "git_filter_list_apply_to_data", + "git_filter_list_apply_to_buffer", "git_filter_list_apply_to_file", "git_filter_list_apply_to_blob", - "git_filter_list_stream_data", + "git_filter_list_stream_buffer", "git_filter_list_stream_file", "git_filter_list_stream_blob", "git_filter_list_free" ], "meta": {}, - "lines": 218 + "lines": 264 }, { "file": "git2/global.h", @@ -404,10 +423,11 @@ "file": "git2/graph.h", "functions": [ "git_graph_ahead_behind", - "git_graph_descendant_of" + "git_graph_descendant_of", + "git_graph_reachable_from_any" ], "meta": {}, - "lines": 54 + "lines": 72 }, { "file": "git2/ignore.h", @@ -482,7 +502,7 @@ "git_indexer_free" ], "meta": {}, - "lines": 142 + "lines": 143 }, { "file": "git2/mailmap.h", @@ -606,6 +626,7 @@ "git_odb_stream_free", "git_odb_open_rstream", "git_odb_write_pack", + "git_odb_write_multi_pack_index", "git_odb_hash", "git_odb_hashfile", "git_odb_object_dup", @@ -617,10 +638,11 @@ "git_odb_add_backend", "git_odb_add_alternate", "git_odb_num_backends", - "git_odb_get_backend" + "git_odb_get_backend", + "git_odb_set_commit_graph" ], "meta": {}, - "lines": 545 + "lines": 569 }, { "file": "git2/odb_backend.h", @@ -661,10 +683,10 @@ { "file": "git2/oidarray.h", "functions": [ - "git_oidarray_free" + "git_oidarray_dispose" ], "meta": {}, - "lines": 34 + "lines": 31 }, { "file": "git2/pack.h", @@ -761,7 +783,7 @@ "git_rebase_free" ], "meta": {}, - "lines": 363 + "lines": 387 }, { "file": "git2/refdb.h", @@ -842,7 +864,7 @@ "git_reference_shorthand" ], "meta": {}, - "lines": 764 + "lines": 767 }, { "file": "git2/refspec.h", @@ -879,6 +901,8 @@ "git_remote_pushurl", "git_remote_set_url", "git_remote_set_pushurl", + "git_remote_set_instance_url", + "git_remote_set_instance_pushurl", "git_remote_add_fetch", "git_remote_get_fetch_refspecs", "git_remote_add_push", @@ -896,6 +920,7 @@ "git_push_negotiation", "git_push_update_reference_cb", "git_url_resolve_cb", + "git_remote_ready_cb", "git_remote_init_callbacks", "git_fetch_options_init", "git_push_options_init", @@ -915,7 +940,7 @@ "git_remote_default_branch" ], "meta": {}, - "lines": 952 + "lines": 1004 }, { "file": "git2/repository.h", @@ -968,7 +993,7 @@ "git_repository_set_ident" ], "meta": {}, - "lines": 943 + "lines": 945 }, { "file": "git2/reset.h", @@ -1068,7 +1093,7 @@ "git_status_should_ignore" ], "meta": {}, - "lines": 383 + "lines": 439 }, { "file": "git2/strarray.h", @@ -1086,6 +1111,7 @@ "git_submodule_update_options_init", "git_submodule_update", "git_submodule_lookup", + "git_submodule_dup", "git_submodule_free", "git_submodule_foreach", "git_submodule_add_setup", @@ -1118,7 +1144,13 @@ "git_submodule_location" ], "meta": {}, - "lines": 650 + "lines": 659 + }, + { + "file": "git2/sys/commit_graph.h", + "functions": [], + "meta": {}, + "lines": 98 }, { "file": "git2/sys/filter.h", @@ -1154,7 +1186,7 @@ "file": "git2/sys/transport.h", "functions": [], "meta": {}, - "lines": 292 + "lines": 293 }, { "file": "git2/tag.h", @@ -1257,13 +1289,13 @@ "git_tree_create_updated" ], "meta": {}, - "lines": 467 + "lines": 469 }, { "file": "git2/types.h", "functions": [], "meta": {}, - "lines": 357 + "lines": 366 }, { "file": "git2/worktree.h", @@ -1285,7 +1317,7 @@ "git_worktree_prune" ], "meta": {}, - "lines": 251 + "lines": 252 } ], "functions": { @@ -1322,7 +1354,7 @@ "group": "annotated", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_annotated_commit_from_ref-1" + "ex/v1.3.0/checkout.html#git_annotated_commit_from_ref-1" ] } }, @@ -1455,12 +1487,12 @@ "group": "annotated", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_annotated_commit_id-2" + "ex/v1.3.0/checkout.html#git_annotated_commit_id-2" ], "merge.c": [ - "ex/HEAD/merge.html#git_annotated_commit_id-1", - "ex/HEAD/merge.html#git_annotated_commit_id-2", - "ex/HEAD/merge.html#git_annotated_commit_id-3" + "ex/v1.3.0/merge.html#git_annotated_commit_id-1", + "ex/v1.3.0/merge.html#git_annotated_commit_id-2", + "ex/v1.3.0/merge.html#git_annotated_commit_id-3" ] } }, @@ -1487,9 +1519,9 @@ "group": "annotated", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_annotated_commit_ref-3", - "ex/HEAD/checkout.html#git_annotated_commit_ref-4", - "ex/HEAD/checkout.html#git_annotated_commit_ref-5" + "ex/v1.3.0/checkout.html#git_annotated_commit_ref-3", + "ex/v1.3.0/checkout.html#git_annotated_commit_ref-4", + "ex/v1.3.0/checkout.html#git_annotated_commit_ref-5" ] } }, @@ -1516,15 +1548,15 @@ "group": "annotated", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_annotated_commit_free-6" + "ex/v1.3.0/checkout.html#git_annotated_commit_free-6" ] } }, "git_apply_to_tree": { "type": "function", "file": "git2/apply.h", - "line": 104, - "lineto": 109, + "line": 105, + "lineto": 110, "args": [ { "name": "out", @@ -1556,7 +1588,7 @@ "sig": "git_index **::git_repository *::git_tree *::git_diff *::const git_apply_options *", "return": { "type": "int", - "comment": null + "comment": " 0 or an error code" }, "description": "

Apply a git_diff to a git_tree, and return the resulting image\n as an index.

\n", "comments": "", @@ -1565,8 +1597,8 @@ "git_apply": { "type": "function", "file": "git2/apply.h", - "line": 141, - "lineto": 145, + "line": 143, + "lineto": 147, "args": [ { "name": "repo", @@ -1593,7 +1625,7 @@ "sig": "git_repository *::git_diff *::git_apply_location_t::const git_apply_options *", "return": { "type": "int", - "comment": null + "comment": " 0 or an error code" }, "description": "

Apply a git_diff to the given repository, making changes directly\n in the working directory, the index, or both.

\n", "comments": "", @@ -1624,8 +1656,8 @@ "git_attr_get": { "type": "function", "file": "git2/attr.h", - "line": 152, - "lineto": 157, + "line": 181, + "lineto": 186, "args": [ { "name": "value_out", @@ -1663,11 +1695,53 @@ "comments": "", "group": "attr" }, + "git_attr_get_ext": { + "type": "function", + "file": "git2/attr.h", + "line": 203, + "lineto": 208, + "args": [ + { + "name": "value_out", + "type": "const char **", + "comment": "Output of the value of the attribute. Use the GIT_ATTR_...\n macros to test for TRUE, FALSE, UNSPECIFIED, etc. or just\n use the string value for attributes set to a value. You\n should NOT modify or free this value." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the path." + }, + { + "name": "opts", + "type": "git_attr_options *", + "comment": "The `git_attr_options` to use when querying these attributes." + }, + { + "name": "path", + "type": "const char *", + "comment": "The path to check for attributes. Relative paths are\n interpreted relative to the repo root. The file does\n not have to exist, but if it does not, then it will be\n treated as a plain file (not a directory)." + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of the attribute to look up." + } + ], + "argline": "const char **value_out, git_repository *repo, git_attr_options *opts, const char *path, const char *name", + "sig": "const char **::git_repository *::git_attr_options *::const char *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Look up the value of one git attribute for path with extended options.

\n", + "comments": "", + "group": "attr" + }, "git_attr_get_many": { "type": "function", "file": "git2/attr.h", - "line": 188, - "lineto": 194, + "line": 239, + "lineto": 245, "args": [ { "name": "values_out", @@ -1710,11 +1784,58 @@ "comments": "

Use this if you have a known list of attributes that you want to look up in a single call. This is somewhat more efficient than calling git_attr_get() multiple times.

\n\n

For example, you might write:

\n\n
 const char *attrs[] = { "crlf", "diff", "foo" };     const char **values[3];     git_attr_get_many(values, repo, 0, "my/fun/file.c", 3, attrs);\n
\n\n

Then you could loop through the 3 values to get the settings for the three attributes you asked about.

\n", "group": "attr" }, + "git_attr_get_many_ext": { + "type": "function", + "file": "git2/attr.h", + "line": 263, + "lineto": 269, + "args": [ + { + "name": "values_out", + "type": "const char **", + "comment": "An array of num_attr entries that will have string\n pointers written into it for the values of the attributes.\n You should not modify or free the values that are written\n into this array (although of course, you should free the\n array itself if you allocated it)." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the path." + }, + { + "name": "opts", + "type": "git_attr_options *", + "comment": "The `git_attr_options` to use when querying these attributes." + }, + { + "name": "path", + "type": "const char *", + "comment": "The path inside the repo to check attributes. This\n does not have to exist, but if it does not, then\n it will be treated as a plain file (i.e. not a directory)." + }, + { + "name": "num_attr", + "type": "size_t", + "comment": "The number of attributes being looked up" + }, + { + "name": "names", + "type": "const char **", + "comment": "An array of num_attr strings containing attribute names." + } + ], + "argline": "const char **values_out, git_repository *repo, git_attr_options *opts, const char *path, size_t num_attr, const char **names", + "sig": "const char **::git_repository *::git_attr_options *::const char *::size_t::const char **", + "return": { + "type": "int", + "comment": null + }, + "description": "

Look up a list of git attributes for path with extended options.

\n", + "comments": "", + "group": "attr" + }, "git_attr_foreach": { "type": "function", "file": "git2/attr.h", - "line": 227, - "lineto": 232, + "line": 302, + "lineto": 307, "args": [ { "name": "repo", @@ -1752,11 +1873,53 @@ "comments": "", "group": "attr" }, + "git_attr_foreach_ext": { + "type": "function", + "file": "git2/attr.h", + "line": 322, + "lineto": 327, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the path." + }, + { + "name": "opts", + "type": "git_attr_options *", + "comment": "The `git_attr_options` to use when querying these attributes." + }, + { + "name": "path", + "type": "const char *", + "comment": "Path inside the repo to check attributes. This does not have\n to exist, but if it does not, then it will be treated as a\n plain file (i.e. not a directory)." + }, + { + "name": "callback", + "type": "git_attr_foreach_cb", + "comment": "Function to invoke on each attribute name and value.\n See git_attr_foreach_cb." + }, + { + "name": "payload", + "type": "void *", + "comment": "Passed on as extra parameter to callback function." + } + ], + "argline": "git_repository *repo, git_attr_options *opts, const char *path, git_attr_foreach_cb callback, void *payload", + "sig": "git_repository *::git_attr_options *::const char *::git_attr_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Loop over all the git attributes for a path with extended options.

\n", + "comments": "", + "group": "attr" + }, "git_attr_cache_flush": { "type": "function", "file": "git2/attr.h", - "line": 245, - "lineto": 246, + "line": 340, + "lineto": 341, "args": [ { "name": "repo", @@ -1777,8 +1940,8 @@ "git_attr_add_macro": { "type": "function", "file": "git2/attr.h", - "line": 258, - "lineto": 261, + "line": 353, + "lineto": 356, "args": [ { "name": "repo", @@ -1809,8 +1972,8 @@ "git_blame_options_init": { "type": "function", "file": "git2/blame.h", - "line": 105, - "lineto": 107, + "line": 138, + "lineto": 140, "args": [ { "name": "opts", @@ -1836,8 +1999,8 @@ "git_blame_get_hunk_count": { "type": "function", "file": "git2/blame.h", - "line": 156, - "lineto": 156, + "line": 207, + "lineto": 207, "args": [ { "name": "blame", @@ -1858,8 +2021,8 @@ "git_blame_get_hunk_byindex": { "type": "function", "file": "git2/blame.h", - "line": 165, - "lineto": 167, + "line": 216, + "lineto": 218, "args": [ { "name": "blame", @@ -1885,8 +2048,8 @@ "git_blame_get_hunk_byline": { "type": "function", "file": "git2/blame.h", - "line": 176, - "lineto": 178, + "line": 227, + "lineto": 229, "args": [ { "name": "blame", @@ -1910,15 +2073,15 @@ "group": "blame", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_blame_get_hunk_byline-1" + "ex/v1.3.0/blame.html#git_blame_get_hunk_byline-1" ] } }, "git_blame_file": { "type": "function", "file": "git2/blame.h", - "line": 191, - "lineto": 195, + "line": 242, + "lineto": 246, "args": [ { "name": "out", @@ -1952,15 +2115,15 @@ "group": "blame", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_blame_file-2" + "ex/v1.3.0/blame.html#git_blame_file-2" ] } }, "git_blame_buffer": { "type": "function", "file": "git2/blame.h", - "line": 215, - "lineto": 219, + "line": 266, + "lineto": 270, "args": [ { "name": "out", @@ -1996,8 +2159,8 @@ "git_blame_free": { "type": "function", "file": "git2/blame.h", - "line": 226, - "lineto": 226, + "line": 277, + "lineto": 277, "args": [ { "name": "blame", @@ -2016,7 +2179,7 @@ "group": "blame", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_blame_free-3" + "ex/v1.3.0/blame.html#git_blame_free-3" ] } }, @@ -2053,10 +2216,10 @@ "group": "blob", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_blob_lookup-4" + "ex/v1.3.0/blame.html#git_blob_lookup-4" ], "general.c": [ - "ex/HEAD/general.html#git_blob_lookup-1" + "ex/v1.3.0/general.html#git_blob_lookup-1" ] } }, @@ -2120,10 +2283,10 @@ "group": "blob", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_blob_free-5" + "ex/v1.3.0/blame.html#git_blob_free-5" ], "general.c": [ - "ex/HEAD/general.html#git_blob_free-2" + "ex/v1.3.0/general.html#git_blob_free-2" ] } }, @@ -2194,13 +2357,13 @@ "group": "blob", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_blob_rawcontent-6" + "ex/v1.3.0/blame.html#git_blob_rawcontent-6" ], "cat-file.c": [ - "ex/HEAD/cat-file.html#git_blob_rawcontent-1" + "ex/v1.3.0/cat-file.html#git_blob_rawcontent-1" ], "general.c": [ - "ex/HEAD/general.html#git_blob_rawcontent-3" + "ex/v1.3.0/general.html#git_blob_rawcontent-3" ] } }, @@ -2227,22 +2390,22 @@ "group": "blob", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_blob_rawsize-7" + "ex/v1.3.0/blame.html#git_blob_rawsize-7" ], "cat-file.c": [ - "ex/HEAD/cat-file.html#git_blob_rawsize-2" + "ex/v1.3.0/cat-file.html#git_blob_rawsize-2" ], "general.c": [ - "ex/HEAD/general.html#git_blob_rawsize-4", - "ex/HEAD/general.html#git_blob_rawsize-5" + "ex/v1.3.0/general.html#git_blob_rawsize-4", + "ex/v1.3.0/general.html#git_blob_rawsize-5" ] } }, "git_blob_filter_options_init": { "type": "function", "file": "git2/blob.h", - "line": 146, - "lineto": 146, + "line": 164, + "lineto": 164, "args": [ { "name": "opts", @@ -2268,8 +2431,8 @@ "git_blob_filter": { "type": "function", "file": "git2/blob.h", - "line": 170, - "lineto": 174, + "line": 188, + "lineto": 192, "args": [ { "name": "out", @@ -2305,8 +2468,8 @@ "git_blob_create_from_workdir": { "type": "function", "file": "git2/blob.h", - "line": 187, - "lineto": 187, + "line": 205, + "lineto": 205, "args": [ { "name": "id", @@ -2337,8 +2500,8 @@ "git_blob_create_from_disk": { "type": "function", "file": "git2/blob.h", - "line": 199, - "lineto": 199, + "line": 217, + "lineto": 217, "args": [ { "name": "id", @@ -2369,8 +2532,8 @@ "git_blob_create_from_stream": { "type": "function", "file": "git2/blob.h", - "line": 226, - "lineto": 229, + "line": 244, + "lineto": 247, "args": [ { "name": "out", @@ -2401,8 +2564,8 @@ "git_blob_create_from_stream_commit": { "type": "function", "file": "git2/blob.h", - "line": 240, - "lineto": 242, + "line": 258, + "lineto": 260, "args": [ { "name": "out", @@ -2428,8 +2591,8 @@ "git_blob_create_from_buffer": { "type": "function", "file": "git2/blob.h", - "line": 253, - "lineto": 254, + "line": 271, + "lineto": 272, "args": [ { "name": "id", @@ -2439,7 +2602,7 @@ { "name": "repo", "type": "git_repository *", - "comment": "repository where to blob will be written" + "comment": "repository where the blob will be written" }, { "name": "buffer", @@ -2465,8 +2628,8 @@ "git_blob_is_binary": { "type": "function", "file": "git2/blob.h", - "line": 267, - "lineto": 267, + "line": 285, + "lineto": 285, "args": [ { "name": "blob", @@ -2487,8 +2650,8 @@ "git_blob_dup": { "type": "function", "file": "git2/blob.h", - "line": 276, - "lineto": 276, + "line": 294, + "lineto": 294, "args": [ { "name": "out", @@ -2596,7 +2759,7 @@ "group": "branch", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_branch_create_from_annotated-7" + "ex/v1.3.0/checkout.html#git_branch_create_from_annotated-7" ] } }, @@ -2810,7 +2973,7 @@ "group": "branch", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_branch_name-4" + "ex/v1.3.0/merge.html#git_branch_name-4" ] } }, @@ -3008,11 +3171,43 @@ "comments": "

This will return the currently configured "branch.*.remote" for a given branch. This branch must be local.

\n", "group": "branch" }, + "git_branch_upstream_merge": { + "type": "function", + "file": "git2/branch.h", + "line": 318, + "lineto": 318, + "args": [ + { + "name": "buf", + "type": "git_buf *", + "comment": "the buffer into which to write the name" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to look" + }, + { + "name": "refname", + "type": "const char *", + "comment": "the full name of the branch" + } + ], + "argline": "git_buf *buf, git_repository *repo, const char *refname", + "sig": "git_buf *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Retrieve the upstream merge of a local branch

\n", + "comments": "

This will return the currently configured "branch.*.merge" for a given branch. This branch must be local.

\n", + "group": "branch" + }, "git_branch_name_is_valid": { "type": "function", "file": "git2/branch.h", - "line": 317, - "lineto": 317, + "line": 330, + "lineto": 330, "args": [ { "name": "valid", @@ -3058,19 +3253,19 @@ "group": "buf", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_buf_dispose-1", - "ex/HEAD/diff.html#git_buf_dispose-2" + "ex/v1.3.0/diff.html#git_buf_dispose-1", + "ex/v1.3.0/diff.html#git_buf_dispose-2" ], "tag.c": [ - "ex/HEAD/tag.html#git_buf_dispose-1" + "ex/v1.3.0/tag.html#git_buf_dispose-1" ] } }, "git_buf_grow": { "type": "function", - "file": "git2/buffer.h", - "line": 101, - "lineto": 101, + "file": "git2/deprecated.h", + "line": 220, + "lineto": 220, "args": [ { "name": "buffer", @@ -3095,9 +3290,9 @@ }, "git_buf_set": { "type": "function", - "file": "git2/buffer.h", - "line": 111, - "lineto": 112, + "file": "git2/deprecated.h", + "line": 230, + "lineto": 231, "args": [ { "name": "buffer", @@ -3127,9 +3322,9 @@ }, "git_buf_is_binary": { "type": "function", - "file": "git2/buffer.h", - "line": 120, - "lineto": 120, + "file": "git2/deprecated.h", + "line": 239, + "lineto": 239, "args": [ { "name": "buf", @@ -3149,9 +3344,9 @@ }, "git_buf_contains_nul": { "type": "function", - "file": "git2/buffer.h", - "line": 128, - "lineto": 128, + "file": "git2/deprecated.h", + "line": 247, + "lineto": 247, "args": [ { "name": "buf", @@ -3172,8 +3367,8 @@ "git_checkout_options_init": { "type": "function", "file": "git2/checkout.h", - "line": 341, - "lineto": 343, + "line": 357, + "lineto": 359, "args": [ { "name": "opts", @@ -3199,8 +3394,8 @@ "git_checkout_head": { "type": "function", "file": "git2/checkout.h", - "line": 362, - "lineto": 364, + "line": 378, + "lineto": 380, "args": [ { "name": "repo", @@ -3226,8 +3421,8 @@ "git_checkout_index": { "type": "function", "file": "git2/checkout.h", - "line": 375, - "lineto": 378, + "line": 391, + "lineto": 394, "args": [ { "name": "repo", @@ -3258,8 +3453,8 @@ "git_checkout_tree": { "type": "function", "file": "git2/checkout.h", - "line": 391, - "lineto": 394, + "line": 407, + "lineto": 410, "args": [ { "name": "repo", @@ -3288,10 +3483,10 @@ "group": "checkout", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_checkout_tree-8" + "ex/v1.3.0/checkout.html#git_checkout_tree-8" ], "merge.c": [ - "ex/HEAD/merge.html#git_checkout_tree-5" + "ex/v1.3.0/merge.html#git_checkout_tree-5" ] } }, @@ -3498,18 +3693,18 @@ "group": "commit", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_commit_lookup-9" + "ex/v1.3.0/checkout.html#git_commit_lookup-9" ], "general.c": [ - "ex/HEAD/general.html#git_commit_lookup-6", - "ex/HEAD/general.html#git_commit_lookup-7", - "ex/HEAD/general.html#git_commit_lookup-8" + "ex/v1.3.0/general.html#git_commit_lookup-6", + "ex/v1.3.0/general.html#git_commit_lookup-7", + "ex/v1.3.0/general.html#git_commit_lookup-8" ], "log.c": [ - "ex/HEAD/log.html#git_commit_lookup-1" + "ex/v1.3.0/log.html#git_commit_lookup-1" ], "merge.c": [ - "ex/HEAD/merge.html#git_commit_lookup-6" + "ex/v1.3.0/merge.html#git_commit_lookup-6" ] } }, @@ -3573,20 +3768,20 @@ "group": "commit", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_commit_free-10" + "ex/v1.3.0/checkout.html#git_commit_free-10" ], "general.c": [ - "ex/HEAD/general.html#git_commit_free-9", - "ex/HEAD/general.html#git_commit_free-10", - "ex/HEAD/general.html#git_commit_free-11", - "ex/HEAD/general.html#git_commit_free-12", - "ex/HEAD/general.html#git_commit_free-13" + "ex/v1.3.0/general.html#git_commit_free-9", + "ex/v1.3.0/general.html#git_commit_free-10", + "ex/v1.3.0/general.html#git_commit_free-11", + "ex/v1.3.0/general.html#git_commit_free-12", + "ex/v1.3.0/general.html#git_commit_free-13" ], "log.c": [ - "ex/HEAD/log.html#git_commit_free-2", - "ex/HEAD/log.html#git_commit_free-3", - "ex/HEAD/log.html#git_commit_free-4", - "ex/HEAD/log.html#git_commit_free-5" + "ex/v1.3.0/log.html#git_commit_free-2", + "ex/v1.3.0/log.html#git_commit_free-3", + "ex/v1.3.0/log.html#git_commit_free-4", + "ex/v1.3.0/log.html#git_commit_free-5" ] } }, @@ -3613,10 +3808,10 @@ "group": "commit", "examples": { "general.c": [ - "ex/HEAD/general.html#git_commit_id-14" + "ex/v1.3.0/general.html#git_commit_id-14" ], "log.c": [ - "ex/HEAD/log.html#git_commit_id-6" + "ex/v1.3.0/log.html#git_commit_id-6" ] } }, @@ -3643,8 +3838,8 @@ "group": "commit", "examples": { "log.c": [ - "ex/HEAD/log.html#git_commit_owner-7", - "ex/HEAD/log.html#git_commit_owner-8" + "ex/v1.3.0/log.html#git_commit_owner-7", + "ex/v1.3.0/log.html#git_commit_owner-8" ] } }, @@ -3693,21 +3888,21 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_commit_message-3", - "ex/HEAD/cat-file.html#git_commit_message-4" + "ex/v1.3.0/cat-file.html#git_commit_message-3", + "ex/v1.3.0/cat-file.html#git_commit_message-4" ], "general.c": [ - "ex/HEAD/general.html#git_commit_message-15", - "ex/HEAD/general.html#git_commit_message-16", - "ex/HEAD/general.html#git_commit_message-17" + "ex/v1.3.0/general.html#git_commit_message-15", + "ex/v1.3.0/general.html#git_commit_message-16", + "ex/v1.3.0/general.html#git_commit_message-17" ], "log.c": [ - "ex/HEAD/log.html#git_commit_message-9", - "ex/HEAD/log.html#git_commit_message-10", - "ex/HEAD/log.html#git_commit_message-11" + "ex/v1.3.0/log.html#git_commit_message-9", + "ex/v1.3.0/log.html#git_commit_message-10", + "ex/v1.3.0/log.html#git_commit_message-11" ], "tag.c": [ - "ex/HEAD/tag.html#git_commit_message-2" + "ex/v1.3.0/tag.html#git_commit_message-2" ] } }, @@ -3800,8 +3995,8 @@ "group": "commit", "examples": { "general.c": [ - "ex/HEAD/general.html#git_commit_time-18", - "ex/HEAD/general.html#git_commit_time-19" + "ex/v1.3.0/general.html#git_commit_time-18", + "ex/v1.3.0/general.html#git_commit_time-19" ] } }, @@ -3850,13 +4045,13 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_commit_committer-5" + "ex/v1.3.0/cat-file.html#git_commit_committer-5" ], "general.c": [ - "ex/HEAD/general.html#git_commit_committer-20" + "ex/v1.3.0/general.html#git_commit_committer-20" ], "log.c": [ - "ex/HEAD/log.html#git_commit_committer-12" + "ex/v1.3.0/log.html#git_commit_committer-12" ] } }, @@ -3883,15 +4078,15 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_commit_author-6" + "ex/v1.3.0/cat-file.html#git_commit_author-6" ], "general.c": [ - "ex/HEAD/general.html#git_commit_author-21", - "ex/HEAD/general.html#git_commit_author-22" + "ex/v1.3.0/general.html#git_commit_author-21", + "ex/v1.3.0/general.html#git_commit_author-22" ], "log.c": [ - "ex/HEAD/log.html#git_commit_author-13", - "ex/HEAD/log.html#git_commit_author-14" + "ex/v1.3.0/log.html#git_commit_author-13", + "ex/v1.3.0/log.html#git_commit_author-14" ] } }, @@ -4009,11 +4204,11 @@ "group": "commit", "examples": { "log.c": [ - "ex/HEAD/log.html#git_commit_tree-15", - "ex/HEAD/log.html#git_commit_tree-16", - "ex/HEAD/log.html#git_commit_tree-17", - "ex/HEAD/log.html#git_commit_tree-18", - "ex/HEAD/log.html#git_commit_tree-19" + "ex/v1.3.0/log.html#git_commit_tree-15", + "ex/v1.3.0/log.html#git_commit_tree-16", + "ex/v1.3.0/log.html#git_commit_tree-17", + "ex/v1.3.0/log.html#git_commit_tree-18", + "ex/v1.3.0/log.html#git_commit_tree-19" ] } }, @@ -4040,7 +4235,7 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_commit_tree_id-7" + "ex/v1.3.0/cat-file.html#git_commit_tree_id-7" ] } }, @@ -4067,14 +4262,14 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_commit_parentcount-8" + "ex/v1.3.0/cat-file.html#git_commit_parentcount-8" ], "general.c": [ - "ex/HEAD/general.html#git_commit_parentcount-23" + "ex/v1.3.0/general.html#git_commit_parentcount-23" ], "log.c": [ - "ex/HEAD/log.html#git_commit_parentcount-20", - "ex/HEAD/log.html#git_commit_parentcount-21" + "ex/v1.3.0/log.html#git_commit_parentcount-20", + "ex/v1.3.0/log.html#git_commit_parentcount-21" ] } }, @@ -4111,11 +4306,11 @@ "group": "commit", "examples": { "general.c": [ - "ex/HEAD/general.html#git_commit_parent-24" + "ex/v1.3.0/general.html#git_commit_parent-24" ], "log.c": [ - "ex/HEAD/log.html#git_commit_parent-22", - "ex/HEAD/log.html#git_commit_parent-23" + "ex/v1.3.0/log.html#git_commit_parent-22", + "ex/v1.3.0/log.html#git_commit_parent-23" ] } }, @@ -4147,10 +4342,10 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_commit_parent_id-9" + "ex/v1.3.0/cat-file.html#git_commit_parent_id-9" ], "log.c": [ - "ex/HEAD/log.html#git_commit_parent_id-24" + "ex/v1.3.0/log.html#git_commit_parent_id-24" ] } }, @@ -4328,7 +4523,7 @@ "group": "commit", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_commit_create-7" + "ex/v1.3.0/merge.html#git_commit_create-7" ] } }, @@ -4395,13 +4590,13 @@ "group": "commit", "examples": { "commit.c": [ - "ex/HEAD/commit.html#git_commit_create_v-1" + "ex/v1.3.0/commit.html#git_commit_create_v-1" ], "general.c": [ - "ex/HEAD/general.html#git_commit_create_v-25" + "ex/v1.3.0/general.html#git_commit_create_v-25" ], "init.c": [ - "ex/HEAD/init.html#git_commit_create_v-1" + "ex/v1.3.0/init.html#git_commit_create_v-1" ] } }, @@ -4644,8 +4839,8 @@ "git_libgit2_opts": { "type": "function", "file": "git2/common.h", - "line": 423, - "lineto": 423, + "line": 456, + "lineto": 456, "args": [ { "name": "option", @@ -4660,7 +4855,7 @@ "comment": " 0 on success, \n<\n0 on failure" }, "description": "

Set or query a library global option

\n", - "comments": "

Available options:

\n\n
* opts(GIT_OPT_GET_MWINDOW_SIZE, size_t *):\n\n    > Get the maximum mmap window size\n\n* opts(GIT_OPT_SET_MWINDOW_SIZE, size_t):\n\n    > Set the maximum mmap window size\n\n* opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, size_t *):\n\n    > Get the maximum memory that will be mapped in total by the library\n\n* opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size_t):\n\n    > Set the maximum amount of memory that can be mapped at any time       > by the library\n\n* opts(GIT_OPT_GET_MWINDOW_FILE_LIMIT, size_t *):\n\n    > Get the maximum number of files that will be mapped at any time by the        > library\n\n* opts(GIT_OPT_SET_MWINDOW_FILE_LIMIT, size_t):\n\n    > Set the maximum number of files that can be mapped at any time        > by the library. The default (0) is unlimited.\n\n* opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf)\n\n    > Get the search path for a given level of config data.  "level" must       > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`,       > `GIT_CONFIG_LEVEL_XDG`, or `GIT_CONFIG_LEVEL_PROGRAMDATA`.        > The search path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path)\n\n    > Set the search path for a level of config data.  The search path      > applied to shared attributes and ignore files, too.       >       > - `path` lists directories delimited by GIT_PATH_LIST_SEPARATOR.      >   Pass NULL to reset to the default (generally based on environment       >   variables).  Use magic path `$PATH` to include the old value        >   of the path (if you want to prepend or append, for instance).       >       > - `level` must be `GIT_CONFIG_LEVEL_SYSTEM`,      >   `GIT_CONFIG_LEVEL_GLOBAL`, `GIT_CONFIG_LEVEL_XDG`, or       >   `GIT_CONFIG_LEVEL_PROGRAMDATA`.\n\n* opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_object_t type, size_t size)\n\n    > Set the maximum data size for the given type of object to be      > considered eligible for caching in memory.  Setting to value to       > zero means that that type of object will not be cached.       > Defaults to 0 for GIT_OBJECT_BLOB (i.e. won't cache blobs) and 4k     > for GIT_OBJECT_COMMIT, GIT_OBJECT_TREE, and GIT_OBJECT_TAG.\n\n* opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes)\n\n    > Set the maximum total data size that will be cached in memory     > across all repositories before libgit2 starts evicting objects        > from the cache.  This is a soft limit, in that the library might      > briefly exceed it, but will start aggressively evicting objects       > from cache when that happens.  The default cache size is 256MB.\n\n* opts(GIT_OPT_ENABLE_CACHING, int enabled)\n\n    > Enable or disable caching completely.     >       > Because caches are repository-specific, disabling the cache       > cannot immediately clear all cached objects, but each cache will      > be cleared on the next attempt to update anything in it.\n\n* opts(GIT_OPT_GET_CACHED_MEMORY, ssize_t *current, ssize_t *allowed)\n\n    > Get the current bytes in cache and the maximum that would be      > allowed in the cache.\n\n* opts(GIT_OPT_GET_TEMPLATE_PATH, git_buf *out)\n\n    > Get the default template path.        > The path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_TEMPLATE_PATH, const char *path)\n\n    > Set the default template path.        >       > - `path` directory of template.\n\n* opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, const char *file, const char *path)\n\n    > Set the SSL certificate-authority locations.      >       > - `file` is the location of a file containing several     >   certificates concatenated together.     > - `path` is the location of a directory holding several       >   certificates, one per file.     >       > Either parameter may be `NULL`, but not both.\n\n* opts(GIT_OPT_SET_USER_AGENT, const char *user_agent)\n\n    > Set the value of the User-Agent header.  This value will be       > appended to "git/1.0", for compatibility with other git clients.      >       > - `user_agent` is the value that will be delivered as the     >   User-Agent header on HTTP requests.\n\n* opts(GIT_OPT_SET_WINDOWS_SHAREMODE, unsigned long value)\n\n    > Set the share mode used when opening files on Windows.        > For more information, see the documentation for CreateFile.       > The default is: FILE_SHARE_READ | FILE_SHARE_WRITE.  This is      > ignored and unused on non-Windows platforms.\n\n* opts(GIT_OPT_GET_WINDOWS_SHAREMODE, unsigned long *value)\n\n    > Get the share mode used when opening files on Windows.\n\n* opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, int enabled)\n\n    > Enable strict input validation when creating new objects      > to ensure that all inputs to the new objects are valid.  For      > example, when this is enabled, the parent(s) and tree inputs      > will be validated when creating a new commit.  This defaults      > to enabled.\n\n* opts(GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION, int enabled)\n\n    > Validate the target of a symbolic ref when creating it.  For      > example, `foobar` is not a valid ref, therefore `foobar` is       > not a valid target for a symbolic ref by default, whereas     > `refs/heads/foobar` is.  Disabling this bypasses validation       > so that an arbitrary strings such as `foobar` can be used     > for a symbolic ref target.  This defaults to enabled.\n\n* opts(GIT_OPT_SET_SSL_CIPHERS, const char *ciphers)\n\n    > Set the SSL ciphers use for HTTPS connections.        >       > - `ciphers` is the list of ciphers that are eanbled.\n\n* opts(GIT_OPT_ENABLE_OFS_DELTA, int enabled)\n\n    > Enable or disable the use of "offset deltas" when creating packfiles,     > and the negotiation of them when talking to a remote server.      > Offset deltas store a delta base location as an offset into the       > packfile from the current location, which provides a shorter encoding     > and thus smaller resultant packfiles.     > Packfiles containing offset deltas can still be read.     > This defaults to enabled.\n\n* opts(GIT_OPT_ENABLE_FSYNC_GITDIR, int enabled)\n\n    > Enable synchronized writes of files in the gitdir using `fsync`       > (or the platform equivalent) to ensure that new object data       > is written to permanent storage, not simply cached.  This     > defaults to disabled.\n\n opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, int enabled)\n\n    > Enable strict verification of object hashsums when reading        > objects from disk. This may impact performance due to an      > additional checksum calculation on each object. This defaults     > to enabled.\n\n opts(GIT_OPT_SET_ALLOCATOR, git_allocator *allocator)\n\n    > Set the memory allocator to a different memory allocator. This        > allocator will then be used to make all memory allocations for        > libgit2 operations.  If the given `allocator` is NULL, then the       > system default will be restored.\n\n opts(GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY, int enabled)\n\n    > Ensure that there are no unsaved changes in the index before      > beginning any operation that reloads the index from disk (eg,     > checkout).  If there are unsaved changes, the instruction will        > fail.  (Using the FORCE flag to checkout will still overwrite     > these changes.)\n\n opts(GIT_OPT_GET_PACK_MAX_OBJECTS, size_t *out)\n\n    > Get the maximum number of objects libgit2 will allow in a pack        > file when downloading a pack file from a remote. This can be      > used to limit maximum memory usage when fetching from an untrusted        > remote.\n\n opts(GIT_OPT_SET_PACK_MAX_OBJECTS, size_t objects)\n\n    > Set the maximum number of objects libgit2 will allow in a pack        > file when downloading a pack file from a remote.\n\n opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, int enabled)       > This will cause .keep file existence checks to be skipped when        > accessing packfiles, which can help performance with remote filesystems.\n\n opts(GIT_OPT_ENABLE_HTTP_EXPECT_CONTINUE, int enabled)     > When connecting to a server using NTLM or Negotiate       > authentication, use expect/continue when POSTing data.        > This option is not available on Windows.\n
\n", + "comments": "

Available options:

\n\n
* opts(GIT_OPT_GET_MWINDOW_SIZE, size_t *):\n\n    > Get the maximum mmap window size\n\n* opts(GIT_OPT_SET_MWINDOW_SIZE, size_t):\n\n    > Set the maximum mmap window size\n\n* opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, size_t *):\n\n    > Get the maximum memory that will be mapped in total by the library\n\n* opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size_t):\n\n    > Set the maximum amount of memory that can be mapped at any time       > by the library\n\n* opts(GIT_OPT_GET_MWINDOW_FILE_LIMIT, size_t *):\n\n    > Get the maximum number of files that will be mapped at any time by the        > library\n\n* opts(GIT_OPT_SET_MWINDOW_FILE_LIMIT, size_t):\n\n    > Set the maximum number of files that can be mapped at any time        > by the library. The default (0) is unlimited.\n\n* opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf)\n\n    > Get the search path for a given level of config data.  "level" must       > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`,       > `GIT_CONFIG_LEVEL_XDG`, or `GIT_CONFIG_LEVEL_PROGRAMDATA`.        > The search path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path)\n\n    > Set the search path for a level of config data.  The search path      > applied to shared attributes and ignore files, too.       >       > - `path` lists directories delimited by GIT_PATH_LIST_SEPARATOR.      >   Pass NULL to reset to the default (generally based on environment       >   variables).  Use magic path `$PATH` to include the old value        >   of the path (if you want to prepend or append, for instance).       >       > - `level` must be `GIT_CONFIG_LEVEL_SYSTEM`,      >   `GIT_CONFIG_LEVEL_GLOBAL`, `GIT_CONFIG_LEVEL_XDG`, or       >   `GIT_CONFIG_LEVEL_PROGRAMDATA`.\n\n* opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_object_t type, size_t size)\n\n    > Set the maximum data size for the given type of object to be      > considered eligible for caching in memory.  Setting to value to       > zero means that that type of object will not be cached.       > Defaults to 0 for GIT_OBJECT_BLOB (i.e. won't cache blobs) and 4k     > for GIT_OBJECT_COMMIT, GIT_OBJECT_TREE, and GIT_OBJECT_TAG.\n\n* opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes)\n\n    > Set the maximum total data size that will be cached in memory     > across all repositories before libgit2 starts evicting objects        > from the cache.  This is a soft limit, in that the library might      > briefly exceed it, but will start aggressively evicting objects       > from cache when that happens.  The default cache size is 256MB.\n\n* opts(GIT_OPT_ENABLE_CACHING, int enabled)\n\n    > Enable or disable caching completely.     >       > Because caches are repository-specific, disabling the cache       > cannot immediately clear all cached objects, but each cache will      > be cleared on the next attempt to update anything in it.\n\n* opts(GIT_OPT_GET_CACHED_MEMORY, ssize_t *current, ssize_t *allowed)\n\n    > Get the current bytes in cache and the maximum that would be      > allowed in the cache.\n\n* opts(GIT_OPT_GET_TEMPLATE_PATH, git_buf *out)\n\n    > Get the default template path.        > The path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_TEMPLATE_PATH, const char *path)\n\n    > Set the default template path.        >       > - `path` directory of template.\n\n* opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, const char *file, const char *path)\n\n    > Set the SSL certificate-authority locations.      >       > - `file` is the location of a file containing several     >   certificates concatenated together.     > - `path` is the location of a directory holding several       >   certificates, one per file.     >       > Either parameter may be `NULL`, but not both.\n\n* opts(GIT_OPT_SET_USER_AGENT, const char *user_agent)\n\n    > Set the value of the User-Agent header.  This value will be       > appended to "git/1.0", for compatibility with other git clients.      >       > - `user_agent` is the value that will be delivered as the     >   User-Agent header on HTTP requests.\n\n* opts(GIT_OPT_SET_WINDOWS_SHAREMODE, unsigned long value)\n\n    > Set the share mode used when opening files on Windows.        > For more information, see the documentation for CreateFile.       > The default is: FILE_SHARE_READ | FILE_SHARE_WRITE.  This is      > ignored and unused on non-Windows platforms.\n\n* opts(GIT_OPT_GET_WINDOWS_SHAREMODE, unsigned long *value)\n\n    > Get the share mode used when opening files on Windows.\n\n* opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, int enabled)\n\n    > Enable strict input validation when creating new objects      > to ensure that all inputs to the new objects are valid.  For      > example, when this is enabled, the parent(s) and tree inputs      > will be validated when creating a new commit.  This defaults      > to enabled.\n\n* opts(GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION, int enabled)\n\n    > Validate the target of a symbolic ref when creating it.  For      > example, `foobar` is not a valid ref, therefore `foobar` is       > not a valid target for a symbolic ref by default, whereas     > `refs/heads/foobar` is.  Disabling this bypasses validation       > so that an arbitrary strings such as `foobar` can be used     > for a symbolic ref target.  This defaults to enabled.\n\n* opts(GIT_OPT_SET_SSL_CIPHERS, const char *ciphers)\n\n    > Set the SSL ciphers use for HTTPS connections.        >       > - `ciphers` is the list of ciphers that are eanbled.\n\n* opts(GIT_OPT_GET_USER_AGENT, git_buf *out)\n\n    > Get the value of the User-Agent header.       > The User-Agent is written to the `out` buffer.\n\n* opts(GIT_OPT_ENABLE_OFS_DELTA, int enabled)\n\n    > Enable or disable the use of "offset deltas" when creating packfiles,     > and the negotiation of them when talking to a remote server.      > Offset deltas store a delta base location as an offset into the       > packfile from the current location, which provides a shorter encoding     > and thus smaller resultant packfiles.     > Packfiles containing offset deltas can still be read.     > This defaults to enabled.\n\n* opts(GIT_OPT_ENABLE_FSYNC_GITDIR, int enabled)\n\n    > Enable synchronized writes of files in the gitdir using `fsync`       > (or the platform equivalent) to ensure that new object data       > is written to permanent storage, not simply cached.  This     > defaults to disabled.\n\n opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, int enabled)\n\n    > Enable strict verification of object hashsums when reading        > objects from disk. This may impact performance due to an      > additional checksum calculation on each object. This defaults     > to enabled.\n\n opts(GIT_OPT_SET_ALLOCATOR, git_allocator *allocator)\n\n    > Set the memory allocator to a different memory allocator. This        > allocator will then be used to make all memory allocations for        > libgit2 operations.  If the given `allocator` is NULL, then the       > system default will be restored.\n\n opts(GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY, int enabled)\n\n    > Ensure that there are no unsaved changes in the index before      > beginning any operation that reloads the index from disk (eg,     > checkout).  If there are unsaved changes, the instruction will        > fail.  (Using the FORCE flag to checkout will still overwrite     > these changes.)\n\n opts(GIT_OPT_GET_PACK_MAX_OBJECTS, size_t *out)\n\n    > Get the maximum number of objects libgit2 will allow in a pack        > file when downloading a pack file from a remote. This can be      > used to limit maximum memory usage when fetching from an untrusted        > remote.\n\n opts(GIT_OPT_SET_PACK_MAX_OBJECTS, size_t objects)\n\n    > Set the maximum number of objects libgit2 will allow in a pack        > file when downloading a pack file from a remote.\n\n opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, int enabled)       > This will cause .keep file existence checks to be skipped when        > accessing packfiles, which can help performance with remote filesystems.\n\n opts(GIT_OPT_ENABLE_HTTP_EXPECT_CONTINUE, int enabled)     > When connecting to a server using NTLM or Negotiate       > authentication, use expect/continue when POSTing data.        > This option is not available on Windows.\n
\n\n

opts(GIT_OPT_SET_ODB_PACKED_PRIORITY, int priority) > Override the default priority of the packed ODB backend which > is added when default backends are assigned to a repository

\n\n

opts(GIT_OPT_SET_ODB_LOOSE_PRIORITY, int priority) > Override the default priority of the loose ODB backend which > is added when default backends are assigned to a repository

\n\n

opts(GIT_OPT_GET_EXTENSIONS, git_strarray *out) > Returns the list of git extensions that are supported. This > is the list of built-in extensions supported by libgit2 and > custom extensions that have been added with > GIT_OPT_SET_EXTENSIONS. Extensions that have been negated > will not be returned. The returned list should be released > with git_strarray_dispose.

\n\n

opts(GIT_OPT_SET_EXTENSIONS, const char **extensions, size_t len) > Set that the given git extensions are supported by the caller. > Extensions supported by libgit2 may be negated by prefixing > them with a !. For example: setting extensions to > { "!noop", "newext" } indicates that the caller does not want > to support repositories with the noop extension but does want > to support repositories with the newext extension.

\n", "group": "libgit2" }, "git_config_entry_free": { @@ -4683,7 +4878,13 @@ }, "description": "

Free a config entry

\n", "comments": "", - "group": "config" + "group": "config", + "examples": { + "config.c": [ + "ex/v1.3.0/config.html#git_config_entry_free-1", + "ex/v1.3.0/config.html#git_config_entry_free-2" + ] + } }, "git_config_find_global": { "type": "function", @@ -4887,7 +5088,7 @@ "group": "config", "examples": { "general.c": [ - "ex/HEAD/general.html#git_config_open_ondisk-26" + "ex/v1.3.0/general.html#git_config_open_ondisk-26" ] } }, @@ -4999,9 +5200,12 @@ "comments": "", "group": "config", "examples": { + "config.c": [ + "ex/v1.3.0/config.html#git_config_free-3" + ], "general.c": [ - "ex/HEAD/general.html#git_config_free-27", - "ex/HEAD/general.html#git_config_free-28" + "ex/v1.3.0/general.html#git_config_free-27", + "ex/v1.3.0/general.html#git_config_free-28" ] } }, @@ -5035,7 +5239,12 @@ }, "description": "

Get the git_config_entry of a config variable.

\n", "comments": "

Free the git_config_entry after use with git_config_entry_free().

\n", - "group": "config" + "group": "config", + "examples": { + "config.c": [ + "ex/v1.3.0/config.html#git_config_get_entry-4" + ] + } }, "git_config_get_int32": { "type": "function", @@ -5070,8 +5279,8 @@ "group": "config", "examples": { "general.c": [ - "ex/HEAD/general.html#git_config_get_int32-29", - "ex/HEAD/general.html#git_config_get_int32-30" + "ex/v1.3.0/general.html#git_config_get_int32-29", + "ex/v1.3.0/general.html#git_config_get_int32-30" ] } }, @@ -5204,8 +5413,8 @@ "group": "config", "examples": { "general.c": [ - "ex/HEAD/general.html#git_config_get_string-31", - "ex/HEAD/general.html#git_config_get_string-32" + "ex/v1.3.0/general.html#git_config_get_string-31", + "ex/v1.3.0/general.html#git_config_get_string-32" ] } }, @@ -5495,7 +5704,12 @@ }, "description": "

Set the value of a string config variable in the config file\n with the highest level (usually the local one).

\n", "comments": "

A copy of the string is made and the user is free to use it afterwards.

\n", - "group": "config" + "group": "config", + "examples": { + "config.c": [ + "ex/v1.3.0/config.html#git_config_set_string-5" + ] + } }, "git_config_set_multivar": { "type": "function", @@ -6359,8 +6573,8 @@ "git_blob_filtered_content": { "type": "function", "file": "git2/deprecated.h", - "line": 114, - "lineto": 118, + "line": 115, + "lineto": 119, "args": [ { "name": "out", @@ -6393,11 +6607,75 @@ "comments": "", "group": "blob" }, + "git_filter_list_stream_data": { + "type": "function", + "file": "git2/deprecated.h", + "line": 139, + "lineto": 142, + "args": [ + { + "name": "filters", + "type": "git_filter_list *", + "comment": null + }, + { + "name": "data", + "type": "git_buf *", + "comment": null + }, + { + "name": "target", + "type": "git_writestream *", + "comment": null + } + ], + "argline": "git_filter_list *filters, git_buf *data, git_writestream *target", + "sig": "git_filter_list *::git_buf *::git_writestream *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Deprecated in favor of git_filter_list_stream_buffer.

\n", + "comments": "", + "group": "filter" + }, + "git_filter_list_apply_to_data": { + "type": "function", + "file": "git2/deprecated.h", + "line": 149, + "lineto": 152, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": null + }, + { + "name": "filters", + "type": "git_filter_list *", + "comment": null + }, + { + "name": "in", + "type": "git_buf *", + "comment": null + } + ], + "argline": "git_buf *out, git_filter_list *filters, git_buf *in", + "sig": "git_buf *::git_filter_list *::git_buf *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Deprecated in favor of git_filter_list_apply_to_buffer.

\n", + "comments": "", + "group": "filter" + }, "git_treebuilder_write_with_buffer": { "type": "function", "file": "git2/deprecated.h", - "line": 144, - "lineto": 145, + "line": 178, + "lineto": 179, "args": [ { "name": "oid", @@ -6428,8 +6706,8 @@ "git_buf_free": { "type": "function", "file": "git2/deprecated.h", - "line": 170, - "lineto": 170, + "line": 259, + "lineto": 259, "args": [ { "name": "buffer", @@ -6447,11 +6725,122 @@ "comments": "

This function is deprecated, but there is no plan to remove this function at this time.

\n", "group": "buf" }, + "git_diff_format_email": { + "type": "function", + "file": "git2/deprecated.h", + "line": 357, + "lineto": 360, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": null + }, + { + "name": "diff", + "type": "git_diff *", + "comment": null + }, + { + "name": "opts", + "type": "const git_diff_format_email_options *", + "comment": null + } + ], + "argline": "git_buf *out, git_diff *diff, const git_diff_format_email_options *opts", + "sig": "git_buf *::git_diff *::const git_diff_format_email_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create an e-mail ready patch from a diff.

\n", + "comments": "", + "group": "diff" + }, + "git_diff_commit_as_email": { + "type": "function", + "file": "git2/deprecated.h", + "line": 368, + "lineto": 375, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": null + }, + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "commit", + "type": "git_commit *", + "comment": null + }, + { + "name": "patch_no", + "type": "size_t", + "comment": null + }, + { + "name": "total_patches", + "type": "size_t", + "comment": null + }, + { + "name": "flags", + "type": "uint32_t", + "comment": null + }, + { + "name": "diff_opts", + "type": "const git_diff_options *", + "comment": null + } + ], + "argline": "git_buf *out, git_repository *repo, git_commit *commit, size_t patch_no, size_t total_patches, uint32_t flags, const git_diff_options *diff_opts", + "sig": "git_buf *::git_repository *::git_commit *::size_t::size_t::uint32_t::const git_diff_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create an e-mail ready patch for a commit.

\n", + "comments": "", + "group": "diff" + }, + "git_diff_format_email_options_init": { + "type": "function", + "file": "git2/deprecated.h", + "line": 387, + "lineto": 389, + "args": [ + { + "name": "opts", + "type": "git_diff_format_email_options *", + "comment": "The `git_blame_options` struct to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "The struct version; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`." + } + ], + "argline": "git_diff_format_email_options *opts, unsigned int version", + "sig": "git_diff_format_email_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initialize git_diff_format_email_options structure

\n", + "comments": "

Initializes a git_diff_format_email_options with default values. Equivalent to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.

\n", + "group": "diff" + }, "giterr_last": { "type": "function", "file": "git2/deprecated.h", - "line": 244, - "lineto": 244, + "line": 450, + "lineto": 450, "args": [], "argline": "", "sig": "", @@ -6466,8 +6855,8 @@ "giterr_clear": { "type": "function", "file": "git2/deprecated.h", - "line": 256, - "lineto": 256, + "line": 462, + "lineto": 462, "args": [], "argline": "", "sig": "", @@ -6482,8 +6871,8 @@ "giterr_set_str": { "type": "function", "file": "git2/deprecated.h", - "line": 268, - "lineto": 268, + "line": 474, + "lineto": 474, "args": [ { "name": "error_class", @@ -6509,8 +6898,8 @@ "giterr_set_oom": { "type": "function", "file": "git2/deprecated.h", - "line": 280, - "lineto": 280, + "line": 486, + "lineto": 486, "args": [], "argline": "", "sig": "", @@ -6525,8 +6914,8 @@ "git_object__size": { "type": "function", "file": "git2/deprecated.h", - "line": 370, - "lineto": 370, + "line": 576, + "lineto": 576, "args": [ { "name": "type", @@ -6547,8 +6936,8 @@ "git_remote_is_valid_name": { "type": "function", "file": "git2/deprecated.h", - "line": 391, - "lineto": 391, + "line": 597, + "lineto": 597, "args": [ { "name": "remote_name", @@ -6569,8 +6958,8 @@ "git_reference_is_valid_name": { "type": "function", "file": "git2/deprecated.h", - "line": 435, - "lineto": 435, + "line": 641, + "lineto": 641, "args": [ { "name": "refname", @@ -6591,8 +6980,8 @@ "git_oid_iszero": { "type": "function", "file": "git2/deprecated.h", - "line": 572, - "lineto": 572, + "line": 778, + "lineto": 778, "args": [ { "name": "id", @@ -6610,6 +6999,28 @@ "comments": "

These types are retained for backward compatibility. The newer versions of these values should be preferred in all new code.

\n\n

There is no plan to remove these backward compatibility values at this time.

\n\n

@{

\n", "group": "oid" }, + "git_oidarray_free": { + "type": "function", + "file": "git2/deprecated.h", + "line": 802, + "lineto": 802, + "args": [ + { + "name": "array", + "type": "git_oidarray *", + "comment": null + } + ], + "argline": "git_oidarray *array", + "sig": "git_oidarray *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the memory referred to by the git_oidarray. This is an alias of\n git_oidarray_dispose and is preserved for backward compatibility.

\n", + "comments": "

This function is deprecated, but there is no plan to remove this function at this time.

\n", + "group": "oidarray" + }, "git_strarray_copy": { "type": "function", "file": "git2/strarray.h", @@ -6640,8 +7051,8 @@ "git_strarray_free": { "type": "function", "file": "git2/deprecated.h", - "line": 653, - "lineto": 653, + "line": 883, + "lineto": 883, "args": [ { "name": "array", @@ -6662,8 +7073,8 @@ "git_blame_init_options": { "type": "function", "file": "git2/deprecated.h", - "line": 667, - "lineto": 667, + "line": 897, + "lineto": 897, "args": [ { "name": "opts", @@ -6714,7 +7125,7 @@ "group": "describe", "examples": { "describe.c": [ - "ex/HEAD/describe.html#git_describe_options_init-1" + "ex/v1.3.0/describe.html#git_describe_options_init-1" ] } }, @@ -6746,7 +7157,7 @@ "group": "describe", "examples": { "describe.c": [ - "ex/HEAD/describe.html#git_describe_format_options_init-2" + "ex/v1.3.0/describe.html#git_describe_format_options_init-2" ] } }, @@ -6783,7 +7194,7 @@ "group": "describe", "examples": { "describe.c": [ - "ex/HEAD/describe.html#git_describe_commit-3" + "ex/v1.3.0/describe.html#git_describe_commit-3" ] } }, @@ -6820,7 +7231,7 @@ "group": "describe", "examples": { "describe.c": [ - "ex/HEAD/describe.html#git_describe_workdir-4" + "ex/v1.3.0/describe.html#git_describe_workdir-4" ] } }, @@ -6857,7 +7268,7 @@ "group": "describe", "examples": { "describe.c": [ - "ex/HEAD/describe.html#git_describe_format-5" + "ex/v1.3.0/describe.html#git_describe_format-5" ] } }, @@ -6886,8 +7297,8 @@ "git_diff_options_init": { "type": "function", "file": "git2/diff.h", - "line": 454, - "lineto": 456, + "line": 468, + "lineto": 470, "args": [ { "name": "opts", @@ -6913,8 +7324,8 @@ "git_diff_find_options_init": { "type": "function", "file": "git2/diff.h", - "line": 787, - "lineto": 789, + "line": 801, + "lineto": 803, "args": [ { "name": "opts", @@ -6940,8 +7351,8 @@ "git_diff_free": { "type": "function", "file": "git2/diff.h", - "line": 803, - "lineto": 803, + "line": 817, + "lineto": 817, "args": [ { "name": "diff", @@ -6960,19 +7371,19 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_free-3" + "ex/v1.3.0/diff.html#git_diff_free-3" ], "log.c": [ - "ex/HEAD/log.html#git_diff_free-25", - "ex/HEAD/log.html#git_diff_free-26" + "ex/v1.3.0/log.html#git_diff_free-25", + "ex/v1.3.0/log.html#git_diff_free-26" ] } }, "git_diff_tree_to_tree": { "type": "function", "file": "git2/diff.h", - "line": 821, - "lineto": 826, + "line": 835, + "lineto": 840, "args": [ { "name": "diff", @@ -7011,19 +7422,19 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_tree_to_tree-4" + "ex/v1.3.0/diff.html#git_diff_tree_to_tree-4" ], "log.c": [ - "ex/HEAD/log.html#git_diff_tree_to_tree-27", - "ex/HEAD/log.html#git_diff_tree_to_tree-28" + "ex/v1.3.0/log.html#git_diff_tree_to_tree-27", + "ex/v1.3.0/log.html#git_diff_tree_to_tree-28" ] } }, "git_diff_tree_to_index": { "type": "function", "file": "git2/diff.h", - "line": 847, - "lineto": 852, + "line": 861, + "lineto": 866, "args": [ { "name": "diff", @@ -7062,15 +7473,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_tree_to_index-5" + "ex/v1.3.0/diff.html#git_diff_tree_to_index-5" ] } }, "git_diff_index_to_workdir": { "type": "function", "file": "git2/diff.h", - "line": 874, - "lineto": 878, + "line": 888, + "lineto": 892, "args": [ { "name": "diff", @@ -7104,15 +7515,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_index_to_workdir-6" + "ex/v1.3.0/diff.html#git_diff_index_to_workdir-6" ] } }, "git_diff_tree_to_workdir": { "type": "function", "file": "git2/diff.h", - "line": 903, - "lineto": 907, + "line": 917, + "lineto": 921, "args": [ { "name": "diff", @@ -7146,15 +7557,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_tree_to_workdir-7" + "ex/v1.3.0/diff.html#git_diff_tree_to_workdir-7" ] } }, "git_diff_tree_to_workdir_with_index": { "type": "function", "file": "git2/diff.h", - "line": 922, - "lineto": 926, + "line": 936, + "lineto": 940, "args": [ { "name": "diff", @@ -7188,15 +7599,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_tree_to_workdir_with_index-8" + "ex/v1.3.0/diff.html#git_diff_tree_to_workdir_with_index-8" ] } }, "git_diff_index_to_index": { "type": "function", "file": "git2/diff.h", - "line": 940, - "lineto": 945, + "line": 954, + "lineto": 959, "args": [ { "name": "diff", @@ -7237,8 +7648,8 @@ "git_diff_merge": { "type": "function", "file": "git2/diff.h", - "line": 960, - "lineto": 962, + "line": 974, + "lineto": 976, "args": [ { "name": "onto", @@ -7264,8 +7675,8 @@ "git_diff_find_similar": { "type": "function", "file": "git2/diff.h", - "line": 976, - "lineto": 978, + "line": 990, + "lineto": 992, "args": [ { "name": "diff", @@ -7289,15 +7700,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_find_similar-9" + "ex/v1.3.0/diff.html#git_diff_find_similar-9" ] } }, "git_diff_num_deltas": { "type": "function", "file": "git2/diff.h", - "line": 996, - "lineto": 996, + "line": 1010, + "lineto": 1010, "args": [ { "name": "diff", @@ -7316,15 +7727,15 @@ "group": "diff", "examples": { "log.c": [ - "ex/HEAD/log.html#git_diff_num_deltas-29" + "ex/v1.3.0/log.html#git_diff_num_deltas-29" ] } }, "git_diff_num_deltas_of_type": { "type": "function", "file": "git2/diff.h", - "line": 1009, - "lineto": 1010, + "line": 1023, + "lineto": 1024, "args": [ { "name": "diff", @@ -7344,14 +7755,14 @@ "comment": " Count of number of deltas matching delta_t type" }, "description": "

Query how many diff deltas are there in a diff filtered by type.

\n", - "comments": "

This works just like git_diff_entrycount() with an extra parameter that is a git_delta_t and returns just the count of how many deltas match that particular type.

\n", + "comments": "

This works just like git_diff_num_deltas() with an extra parameter that is a git_delta_t and returns just the count of how many deltas match that particular type.

\n", "group": "diff" }, "git_diff_get_delta": { "type": "function", "file": "git2/diff.h", - "line": 1029, - "lineto": 1030, + "line": 1043, + "lineto": 1044, "args": [ { "name": "diff", @@ -7377,8 +7788,8 @@ "git_diff_is_sorted_icase": { "type": "function", "file": "git2/diff.h", - "line": 1038, - "lineto": 1038, + "line": 1052, + "lineto": 1052, "args": [ { "name": "diff", @@ -7399,8 +7810,8 @@ "git_diff_foreach": { "type": "function", "file": "git2/diff.h", - "line": 1066, - "lineto": 1072, + "line": 1080, + "lineto": 1086, "args": [ { "name": "diff", @@ -7446,8 +7857,8 @@ "git_diff_status_char": { "type": "function", "file": "git2/diff.h", - "line": 1085, - "lineto": 1085, + "line": 1099, + "lineto": 1099, "args": [ { "name": "status", @@ -7468,8 +7879,8 @@ "git_diff_print": { "type": "function", "file": "git2/diff.h", - "line": 1111, - "lineto": 1115, + "line": 1125, + "lineto": 1129, "args": [ { "name": "diff", @@ -7503,18 +7914,18 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_print-10" + "ex/v1.3.0/diff.html#git_diff_print-10" ], "log.c": [ - "ex/HEAD/log.html#git_diff_print-30" + "ex/v1.3.0/log.html#git_diff_print-30" ] } }, "git_diff_to_buf": { "type": "function", "file": "git2/diff.h", - "line": 1127, - "lineto": 1130, + "line": 1141, + "lineto": 1144, "args": [ { "name": "out", @@ -7545,8 +7956,8 @@ "git_diff_blobs": { "type": "function", "file": "git2/diff.h", - "line": 1167, - "lineto": 1177, + "line": 1181, + "lineto": 1191, "args": [ { "name": "old_blob", @@ -7612,8 +8023,8 @@ "git_diff_blob_to_buffer": { "type": "function", "file": "git2/diff.h", - "line": 1204, - "lineto": 1215, + "line": 1218, + "lineto": 1229, "args": [ { "name": "old_blob", @@ -7684,8 +8095,8 @@ "git_diff_buffers": { "type": "function", "file": "git2/diff.h", - "line": 1238, - "lineto": 1250, + "line": 1252, + "lineto": 1264, "args": [ { "name": "old_buffer", @@ -7761,8 +8172,8 @@ "git_diff_from_buffer": { "type": "function", "file": "git2/diff.h", - "line": 1271, - "lineto": 1274, + "line": 1285, + "lineto": 1288, "args": [ { "name": "out", @@ -7791,15 +8202,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_from_buffer-11" + "ex/v1.3.0/diff.html#git_diff_from_buffer-11" ] } }, "git_diff_get_stats": { "type": "function", "file": "git2/diff.h", - "line": 1310, - "lineto": 1312, + "line": 1324, + "lineto": 1326, "args": [ { "name": "out", @@ -7823,15 +8234,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_get_stats-12" + "ex/v1.3.0/diff.html#git_diff_get_stats-12" ] } }, "git_diff_stats_files_changed": { "type": "function", "file": "git2/diff.h", - "line": 1320, - "lineto": 1321, + "line": 1334, + "lineto": 1335, "args": [ { "name": "stats", @@ -7852,8 +8263,8 @@ "git_diff_stats_insertions": { "type": "function", "file": "git2/diff.h", - "line": 1329, - "lineto": 1330, + "line": 1343, + "lineto": 1344, "args": [ { "name": "stats", @@ -7874,8 +8285,8 @@ "git_diff_stats_deletions": { "type": "function", "file": "git2/diff.h", - "line": 1338, - "lineto": 1339, + "line": 1352, + "lineto": 1353, "args": [ { "name": "stats", @@ -7896,8 +8307,8 @@ "git_diff_stats_to_buf": { "type": "function", "file": "git2/diff.h", - "line": 1350, - "lineto": 1354, + "line": 1364, + "lineto": 1368, "args": [ { "name": "out", @@ -7931,15 +8342,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_stats_to_buf-13" + "ex/v1.3.0/diff.html#git_diff_stats_to_buf-13" ] } }, "git_diff_stats_free": { "type": "function", "file": "git2/diff.h", - "line": 1362, - "lineto": 1362, + "line": 1376, + "lineto": 1376, "args": [ { "name": "stats", @@ -7958,126 +8369,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_diff_stats_free-14" + "ex/v1.3.0/diff.html#git_diff_stats_free-14" ] } }, - "git_diff_format_email": { - "type": "function", - "file": "git2/diff.h", - "line": 1415, - "lineto": 1418, - "args": [ - { - "name": "out", - "type": "git_buf *", - "comment": "buffer to store the e-mail patch in" - }, - { - "name": "diff", - "type": "git_diff *", - "comment": "containing the commit" - }, - { - "name": "opts", - "type": "const git_diff_format_email_options *", - "comment": "structure with options to influence content and formatting." - } - ], - "argline": "git_buf *out, git_diff *diff, const git_diff_format_email_options *opts", - "sig": "git_buf *::git_diff *::const git_diff_format_email_options *", - "return": { - "type": "int", - "comment": " 0 or an error code" - }, - "description": "

Create an e-mail ready patch from a diff.

\n", - "comments": "", - "group": "diff" - }, - "git_diff_commit_as_email": { - "type": "function", - "file": "git2/diff.h", - "line": 1434, - "lineto": 1441, - "args": [ - { - "name": "out", - "type": "git_buf *", - "comment": "buffer to store the e-mail patch in" - }, - { - "name": "repo", - "type": "git_repository *", - "comment": "containing the commit" - }, - { - "name": "commit", - "type": "git_commit *", - "comment": "pointer to up commit" - }, - { - "name": "patch_no", - "type": "size_t", - "comment": "patch number of the commit" - }, - { - "name": "total_patches", - "type": "size_t", - "comment": "total number of patches in the patch set" - }, - { - "name": "flags", - "type": "uint32_t", - "comment": "determines the formatting of the e-mail" - }, - { - "name": "diff_opts", - "type": "const git_diff_options *", - "comment": "structure with options to influence diff or NULL for defaults." - } - ], - "argline": "git_buf *out, git_repository *repo, git_commit *commit, size_t patch_no, size_t total_patches, uint32_t flags, const git_diff_options *diff_opts", - "sig": "git_buf *::git_repository *::git_commit *::size_t::size_t::uint32_t::const git_diff_options *", - "return": { - "type": "int", - "comment": " 0 or an error code" - }, - "description": "

Create an e-mail ready patch for a commit.

\n", - "comments": "

Does not support creating patches for merge commits (yet).

\n", - "group": "diff" - }, - "git_diff_format_email_options_init": { - "type": "function", - "file": "git2/diff.h", - "line": 1453, - "lineto": 1455, - "args": [ - { - "name": "opts", - "type": "git_diff_format_email_options *", - "comment": "The `git_blame_options` struct to initialize." - }, - { - "name": "version", - "type": "unsigned int", - "comment": "The struct version; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`." - } - ], - "argline": "git_diff_format_email_options *opts, unsigned int version", - "sig": "git_diff_format_email_options *::unsigned int", - "return": { - "type": "int", - "comment": " Zero on success; -1 on failure." - }, - "description": "

Initialize git_diff_format_email_options structure

\n", - "comments": "

Initializes a git_diff_format_email_options with default values. Equivalent to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.

\n", - "group": "diff" - }, "git_diff_patchid_options_init": { "type": "function", "file": "git2/diff.h", - "line": 1481, - "lineto": 1483, + "line": 1402, + "lineto": 1404, "args": [ { "name": "opts", @@ -8103,8 +8403,8 @@ "git_diff_patchid": { "type": "function", "file": "git2/diff.h", - "line": 1504, - "lineto": 1504, + "line": 1425, + "lineto": 1425, "args": [ { "name": "out", @@ -8149,20 +8449,25 @@ "group": "error", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_error_last-11", - "ex/HEAD/checkout.html#git_error_last-12", - "ex/HEAD/checkout.html#git_error_last-13", - "ex/HEAD/checkout.html#git_error_last-14" + "ex/v1.3.0/checkout.html#git_error_last-11", + "ex/v1.3.0/checkout.html#git_error_last-12", + "ex/v1.3.0/checkout.html#git_error_last-13", + "ex/v1.3.0/checkout.html#git_error_last-14" ], "commit.c": [ - "ex/HEAD/commit.html#git_error_last-2" + "ex/v1.3.0/commit.html#git_error_last-2" + ], + "config.c": [ + "ex/v1.3.0/config.html#git_error_last-6", + "ex/v1.3.0/config.html#git_error_last-7", + "ex/v1.3.0/config.html#git_error_last-8" ], "general.c": [ - "ex/HEAD/general.html#git_error_last-33" + "ex/v1.3.0/general.html#git_error_last-33" ], "merge.c": [ - "ex/HEAD/merge.html#git_error_last-8", - "ex/HEAD/merge.html#git_error_last-9" + "ex/v1.3.0/merge.html#git_error_last-8", + "ex/v1.3.0/merge.html#git_error_last-9" ] } }, @@ -8228,8 +8533,8 @@ "git_filter_list_load": { "type": "function", "file": "git2/filter.h", - "line": 98, - "lineto": 104, + "line": 129, + "lineto": 135, "args": [ { "name": "filters", @@ -8272,11 +8577,58 @@ "comments": "

This will return 0 (success) but set the output git_filter_list to NULL if no filters are requested for the given file.

\n", "group": "filter" }, + "git_filter_list_load_ext": { + "type": "function", + "file": "git2/filter.h", + "line": 152, + "lineto": 158, + "args": [ + { + "name": "filters", + "type": "git_filter_list **", + "comment": "Output newly created git_filter_list (or NULL)" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository object that contains `path`" + }, + { + "name": "blob", + "type": "git_blob *", + "comment": "The blob to which the filter will be applied (if known)" + }, + { + "name": "path", + "type": "const char *", + "comment": "Relative path of the file to be filtered" + }, + { + "name": "mode", + "type": "git_filter_mode_t", + "comment": "Filtering direction (WT->ODB or ODB->WT)" + }, + { + "name": "opts", + "type": "git_filter_options *", + "comment": "The `git_filter_options` to use when loading filters" + } + ], + "argline": "git_filter_list **filters, git_repository *repo, git_blob *blob, const char *path, git_filter_mode_t mode, git_filter_options *opts", + "sig": "git_filter_list **::git_repository *::git_blob *::const char *::git_filter_mode_t::git_filter_options *", + "return": { + "type": "int", + "comment": " 0 on success (which could still return NULL if no filters are\n needed for the requested file), \n<\n0 on error" + }, + "description": "

Load the filter list for a given path.

\n", + "comments": "

This will return 0 (success) but set the output git_filter_list to NULL if no filters are requested for the given file.

\n", + "group": "filter" + }, "git_filter_list_contains": { "type": "function", "file": "git2/filter.h", - "line": 118, - "lineto": 120, + "line": 172, + "lineto": 174, "args": [ { "name": "filters", @@ -8299,11 +8651,11 @@ "comments": "

This will return 0 if the given filter is not in the list, or 1 if the filter will be applied.

\n", "group": "filter" }, - "git_filter_list_apply_to_data": { + "git_filter_list_apply_to_buffer": { "type": "function", "file": "git2/filter.h", - "line": 142, - "lineto": 145, + "line": 185, + "lineto": 189, "args": [ { "name": "out", @@ -8317,25 +8669,30 @@ }, { "name": "in", - "type": "git_buf *", + "type": "const char *", "comment": "Buffer containing the data to filter" + }, + { + "name": "in_len", + "type": "size_t", + "comment": "The length of the input buffer" } ], - "argline": "git_buf *out, git_filter_list *filters, git_buf *in", - "sig": "git_buf *::git_filter_list *::git_buf *", + "argline": "git_buf *out, git_filter_list *filters, const char *in, size_t in_len", + "sig": "git_buf *::git_filter_list *::const char *::size_t", "return": { "type": "int", "comment": " 0 on success, an error code otherwise" }, "description": "

Apply filter list to a data buffer.

\n", - "comments": "

See git2/buffer.h for background on git_buf objects.

\n\n

If the in buffer holds data allocated by libgit2 (i.e. in->asize is not zero), then it will be overwritten when applying the filters. If not, then it will be left untouched.

\n\n

If there are no filters to apply (or filters is NULL), then the out buffer will reference the in buffer data (with asize set to zero) instead of allocating data. This keeps allocations to a minimum, but it means you have to be careful about freeing the in data since out may be pointing to it!

\n", + "comments": "", "group": "filter" }, "git_filter_list_apply_to_file": { "type": "function", "file": "git2/filter.h", - "line": 156, - "lineto": 160, + "line": 200, + "lineto": 204, "args": [ { "name": "out", @@ -8371,8 +8728,8 @@ "git_filter_list_apply_to_blob": { "type": "function", "file": "git2/filter.h", - "line": 169, - "lineto": 172, + "line": 213, + "lineto": 216, "args": [ { "name": "out", @@ -8400,11 +8757,11 @@ "comments": "", "group": "filter" }, - "git_filter_list_stream_data": { + "git_filter_list_stream_buffer": { "type": "function", "file": "git2/filter.h", - "line": 181, - "lineto": 184, + "line": 226, + "lineto": 230, "args": [ { "name": "filters", @@ -8412,18 +8769,23 @@ "comment": "the list of filters to apply" }, { - "name": "data", - "type": "git_buf *", + "name": "buffer", + "type": "const char *", "comment": "the buffer to filter" }, + { + "name": "len", + "type": "size_t", + "comment": "the size of the buffer" + }, { "name": "target", "type": "git_writestream *", "comment": "the stream into which the data will be written" } ], - "argline": "git_filter_list *filters, git_buf *data, git_writestream *target", - "sig": "git_filter_list *::git_buf *::git_writestream *", + "argline": "git_filter_list *filters, const char *buffer, size_t len, git_writestream *target", + "sig": "git_filter_list *::const char *::size_t::git_writestream *", "return": { "type": "int", "comment": null @@ -8435,8 +8797,8 @@ "git_filter_list_stream_file": { "type": "function", "file": "git2/filter.h", - "line": 195, - "lineto": 199, + "line": 241, + "lineto": 245, "args": [ { "name": "filters", @@ -8472,8 +8834,8 @@ "git_filter_list_stream_blob": { "type": "function", "file": "git2/filter.h", - "line": 208, - "lineto": 211, + "line": 254, + "lineto": 257, "args": [ { "name": "filters", @@ -8504,8 +8866,8 @@ "git_filter_list_free": { "type": "function", "file": "git2/filter.h", - "line": 218, - "lineto": 218, + "line": 264, + "lineto": 264, "args": [ { "name": "filters", @@ -8540,7 +8902,7 @@ "group": "libgit2", "examples": { "general.c": [ - "ex/HEAD/general.html#git_libgit2_init-34" + "ex/v1.3.0/general.html#git_libgit2_init-34" ] } }, @@ -8605,23 +8967,23 @@ "git_graph_descendant_of": { "type": "function", "file": "git2/graph.h", - "line": 51, - "lineto": 54, + "line": 52, + "lineto": 55, "args": [ { "name": "repo", "type": "git_repository *", - "comment": null + "comment": "the repository where the commits exist" }, { "name": "commit", "type": "const git_oid *", - "comment": "a previously loaded commit." + "comment": "a previously loaded commit" }, { "name": "ancestor", "type": "const git_oid *", - "comment": "a potential ancestor commit." + "comment": "a potential ancestor commit" } ], "argline": "git_repository *repo, const git_oid *commit, const git_oid *ancestor", @@ -8634,6 +8996,43 @@ "comments": "

Note that a commit is not considered a descendant of itself, in contrast to git merge-base --is-ancestor.

\n", "group": "graph" }, + "git_graph_reachable_from_any": { + "type": "function", + "file": "git2/graph.h", + "line": 68, + "lineto": 72, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository where the commits exist" + }, + { + "name": "commit", + "type": "const git_oid *", + "comment": "a previously loaded commit" + }, + { + "name": "descendant_array", + "type": "const git_oid []", + "comment": "oids of the commits" + }, + { + "name": "length", + "type": "size_t", + "comment": "the number of commits in the provided `descendant_array`" + } + ], + "argline": "git_repository *repo, const git_oid *commit, const git_oid [] descendant_array, size_t length", + "sig": "git_repository *::const git_oid *::const git_oid []::size_t", + "return": { + "type": "int", + "comment": " 1 if the given commit is an ancestor of any of the given potential\n descendants, 0 if not, error code otherwise." + }, + "description": "

Determine if a commit is reachable from any of a list of commits by\n following parent edges.

\n", + "comments": "", + "group": "graph" + }, "git_ignore_add_rule": { "type": "function", "file": "git2/ignore.h", @@ -8787,19 +9186,19 @@ "group": "index", "examples": { "add.c": [ - "ex/HEAD/add.html#git_index_free-1" + "ex/v1.3.0/add.html#git_index_free-1" ], "commit.c": [ - "ex/HEAD/commit.html#git_index_free-3" + "ex/v1.3.0/commit.html#git_index_free-3" ], "general.c": [ - "ex/HEAD/general.html#git_index_free-35" + "ex/v1.3.0/general.html#git_index_free-35" ], "init.c": [ - "ex/HEAD/init.html#git_index_free-2" + "ex/v1.3.0/init.html#git_index_free-2" ], "ls-files.c": [ - "ex/HEAD/ls-files.html#git_index_free-1" + "ex/v1.3.0/ls-files.html#git_index_free-1" ] } }, @@ -8973,10 +9372,10 @@ "group": "index", "examples": { "add.c": [ - "ex/HEAD/add.html#git_index_write-2" + "ex/v1.3.0/add.html#git_index_write-2" ], "commit.c": [ - "ex/HEAD/commit.html#git_index_write-4" + "ex/v1.3.0/commit.html#git_index_write-4" ] } }, @@ -9079,13 +9478,13 @@ "group": "index", "examples": { "commit.c": [ - "ex/HEAD/commit.html#git_index_write_tree-5" + "ex/v1.3.0/commit.html#git_index_write_tree-5" ], "init.c": [ - "ex/HEAD/init.html#git_index_write_tree-3" + "ex/v1.3.0/init.html#git_index_write_tree-3" ], "merge.c": [ - "ex/HEAD/merge.html#git_index_write_tree-10" + "ex/v1.3.0/merge.html#git_index_write_tree-10" ] } }, @@ -9144,10 +9543,10 @@ "group": "index", "examples": { "general.c": [ - "ex/HEAD/general.html#git_index_entrycount-36" + "ex/v1.3.0/general.html#git_index_entrycount-36" ], "ls-files.c": [ - "ex/HEAD/ls-files.html#git_index_entrycount-2" + "ex/v1.3.0/ls-files.html#git_index_entrycount-2" ] } }, @@ -9201,10 +9600,10 @@ "group": "index", "examples": { "general.c": [ - "ex/HEAD/general.html#git_index_get_byindex-37" + "ex/v1.3.0/general.html#git_index_get_byindex-37" ], "ls-files.c": [ - "ex/HEAD/ls-files.html#git_index_get_byindex-3" + "ex/v1.3.0/ls-files.html#git_index_get_byindex-3" ] } }, @@ -9241,7 +9640,7 @@ "group": "index", "examples": { "ls-files.c": [ - "ex/HEAD/ls-files.html#git_index_get_bypath-4" + "ex/v1.3.0/ls-files.html#git_index_get_bypath-4" ] } }, @@ -9590,7 +9989,7 @@ "group": "index", "examples": { "add.c": [ - "ex/HEAD/add.html#git_index_add_all-3" + "ex/v1.3.0/add.html#git_index_add_all-3" ] } }, @@ -9669,7 +10068,7 @@ "group": "index", "examples": { "add.c": [ - "ex/HEAD/add.html#git_index_update_all-4" + "ex/v1.3.0/add.html#git_index_update_all-4" ] } }, @@ -9699,7 +10098,7 @@ "sig": "size_t *::git_index *::const char *", "return": { "type": "int", - "comment": " a zero-based position in the index if found; GIT_ENOTFOUND otherwise" + "comment": " 0 or an error code" }, "description": "

Find the first position of any entries which point to given\n path in the Git index.

\n", "comments": "", @@ -9731,7 +10130,7 @@ "sig": "size_t *::git_index *::const char *", "return": { "type": "int", - "comment": " 0 with valid value in at_pos; an error code otherwise" + "comment": " 0 or an error code" }, "description": "

Find the first position of any entries matching a prefix. To find the first position\n of a path inside a given folder, suffix the prefix with a '/'.

\n", "comments": "", @@ -9888,7 +10287,7 @@ "group": "index", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_index_has_conflicts-11" + "ex/v1.3.0/merge.html#git_index_has_conflicts-11" ] } }, @@ -9920,7 +10319,7 @@ "group": "index", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_index_conflict_iterator_new-12" + "ex/v1.3.0/merge.html#git_index_conflict_iterator_new-12" ] } }, @@ -9962,7 +10361,7 @@ "group": "index", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_index_conflict_next-13" + "ex/v1.3.0/merge.html#git_index_conflict_next-13" ] } }, @@ -9989,15 +10388,15 @@ "group": "index", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_index_conflict_iterator_free-14" + "ex/v1.3.0/merge.html#git_index_conflict_iterator_free-14" ] } }, "git_indexer_options_init": { "type": "function", "file": "git2/indexer.h", - "line": 85, - "lineto": 87, + "line": 86, + "lineto": 88, "args": [ { "name": "opts", @@ -10023,8 +10422,8 @@ "git_indexer_new": { "type": "function", "file": "git2/indexer.h", - "line": 101, - "lineto": 106, + "line": 102, + "lineto": 107, "args": [ { "name": "out", @@ -10065,8 +10464,8 @@ "git_indexer_append": { "type": "function", "file": "git2/indexer.h", - "line": 116, - "lineto": 116, + "line": 117, + "lineto": 117, "args": [ { "name": "idx", @@ -10102,8 +10501,8 @@ "git_indexer_commit": { "type": "function", "file": "git2/indexer.h", - "line": 125, - "lineto": 125, + "line": 126, + "lineto": 126, "args": [ { "name": "idx", @@ -10129,8 +10528,8 @@ "git_indexer_hash": { "type": "function", "file": "git2/indexer.h", - "line": 135, - "lineto": 135, + "line": 136, + "lineto": 136, "args": [ { "name": "idx", @@ -10151,8 +10550,8 @@ "git_indexer_free": { "type": "function", "file": "git2/indexer.h", - "line": 142, - "lineto": 142, + "line": 143, + "lineto": 143, "args": [ { "name": "idx", @@ -10513,7 +10912,7 @@ "group": "merge", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_merge_analysis-15" + "ex/v1.3.0/merge.html#git_merge_analysis-15" ] } }, @@ -10602,10 +11001,10 @@ "group": "merge", "examples": { "log.c": [ - "ex/HEAD/log.html#git_merge_base-31" + "ex/v1.3.0/log.html#git_merge_base-31" ], "rev-parse.c": [ - "ex/HEAD/rev-parse.html#git_merge_base-1" + "ex/v1.3.0/rev-parse.html#git_merge_base-1" ] } }, @@ -11000,7 +11399,7 @@ "group": "merge", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_merge-16" + "ex/v1.3.0/merge.html#git_merge-16" ] } }, @@ -11697,10 +12096,10 @@ "group": "object", "examples": { "log.c": [ - "ex/HEAD/log.html#git_object_lookup-32" + "ex/v1.3.0/log.html#git_object_lookup-32" ], "merge.c": [ - "ex/HEAD/merge.html#git_object_lookup-17" + "ex/v1.3.0/merge.html#git_object_lookup-17" ] } }, @@ -11806,27 +12205,27 @@ "group": "object", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_object_id-8", - "ex/HEAD/blame.html#git_object_id-9", - "ex/HEAD/blame.html#git_object_id-10", - "ex/HEAD/blame.html#git_object_id-11" + "ex/v1.3.0/blame.html#git_object_id-8", + "ex/v1.3.0/blame.html#git_object_id-9", + "ex/v1.3.0/blame.html#git_object_id-10", + "ex/v1.3.0/blame.html#git_object_id-11" ], "cat-file.c": [ - "ex/HEAD/cat-file.html#git_object_id-10", - "ex/HEAD/cat-file.html#git_object_id-11" + "ex/v1.3.0/cat-file.html#git_object_id-10", + "ex/v1.3.0/cat-file.html#git_object_id-11" ], "log.c": [ - "ex/HEAD/log.html#git_object_id-33", - "ex/HEAD/log.html#git_object_id-34", - "ex/HEAD/log.html#git_object_id-35", - "ex/HEAD/log.html#git_object_id-36" + "ex/v1.3.0/log.html#git_object_id-33", + "ex/v1.3.0/log.html#git_object_id-34", + "ex/v1.3.0/log.html#git_object_id-35", + "ex/v1.3.0/log.html#git_object_id-36" ], "rev-parse.c": [ - "ex/HEAD/rev-parse.html#git_object_id-2", - "ex/HEAD/rev-parse.html#git_object_id-3", - "ex/HEAD/rev-parse.html#git_object_id-4", - "ex/HEAD/rev-parse.html#git_object_id-5", - "ex/HEAD/rev-parse.html#git_object_id-6" + "ex/v1.3.0/rev-parse.html#git_object_id-2", + "ex/v1.3.0/rev-parse.html#git_object_id-3", + "ex/v1.3.0/rev-parse.html#git_object_id-4", + "ex/v1.3.0/rev-parse.html#git_object_id-5", + "ex/v1.3.0/rev-parse.html#git_object_id-6" ] } }, @@ -11858,7 +12257,7 @@ "group": "object", "examples": { "tag.c": [ - "ex/HEAD/tag.html#git_object_short_id-3" + "ex/v1.3.0/tag.html#git_object_short_id-3" ] } }, @@ -11885,12 +12284,12 @@ "group": "object", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_object_type-12", - "ex/HEAD/cat-file.html#git_object_type-13", - "ex/HEAD/cat-file.html#git_object_type-14" + "ex/v1.3.0/cat-file.html#git_object_type-12", + "ex/v1.3.0/cat-file.html#git_object_type-13", + "ex/v1.3.0/cat-file.html#git_object_type-14" ], "tag.c": [ - "ex/HEAD/tag.html#git_object_type-4" + "ex/v1.3.0/tag.html#git_object_type-4" ] } }, @@ -11939,33 +12338,33 @@ "group": "object", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_object_free-12", - "ex/HEAD/blame.html#git_object_free-13", - "ex/HEAD/blame.html#git_object_free-14", - "ex/HEAD/blame.html#git_object_free-15" + "ex/v1.3.0/blame.html#git_object_free-12", + "ex/v1.3.0/blame.html#git_object_free-13", + "ex/v1.3.0/blame.html#git_object_free-14", + "ex/v1.3.0/blame.html#git_object_free-15" ], "cat-file.c": [ - "ex/HEAD/cat-file.html#git_object_free-15" + "ex/v1.3.0/cat-file.html#git_object_free-15" ], "general.c": [ - "ex/HEAD/general.html#git_object_free-38" + "ex/v1.3.0/general.html#git_object_free-38" ], "log.c": [ - "ex/HEAD/log.html#git_object_free-37" + "ex/v1.3.0/log.html#git_object_free-37" ], "merge.c": [ - "ex/HEAD/merge.html#git_object_free-18" + "ex/v1.3.0/merge.html#git_object_free-18" ], "rev-parse.c": [ - "ex/HEAD/rev-parse.html#git_object_free-7", - "ex/HEAD/rev-parse.html#git_object_free-8", - "ex/HEAD/rev-parse.html#git_object_free-9" + "ex/v1.3.0/rev-parse.html#git_object_free-7", + "ex/v1.3.0/rev-parse.html#git_object_free-8", + "ex/v1.3.0/rev-parse.html#git_object_free-9" ], "tag.c": [ - "ex/HEAD/tag.html#git_object_free-5", - "ex/HEAD/tag.html#git_object_free-6", - "ex/HEAD/tag.html#git_object_free-7", - "ex/HEAD/tag.html#git_object_free-8" + "ex/v1.3.0/tag.html#git_object_free-5", + "ex/v1.3.0/tag.html#git_object_free-6", + "ex/v1.3.0/tag.html#git_object_free-7", + "ex/v1.3.0/tag.html#git_object_free-8" ] } }, @@ -11992,14 +12391,14 @@ "group": "object", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_object_type2string-16", - "ex/HEAD/cat-file.html#git_object_type2string-17", - "ex/HEAD/cat-file.html#git_object_type2string-18", - "ex/HEAD/cat-file.html#git_object_type2string-19" + "ex/v1.3.0/cat-file.html#git_object_type2string-16", + "ex/v1.3.0/cat-file.html#git_object_type2string-17", + "ex/v1.3.0/cat-file.html#git_object_type2string-18", + "ex/v1.3.0/cat-file.html#git_object_type2string-19" ], "general.c": [ - "ex/HEAD/general.html#git_object_type2string-39", - "ex/HEAD/general.html#git_object_type2string-40" + "ex/v1.3.0/general.html#git_object_type2string-39", + "ex/v1.3.0/general.html#git_object_type2string-40" ] } }, @@ -12176,7 +12575,7 @@ "sig": "git_odb *::const char *", "return": { "type": "int", - "comment": " 0 on success; error code otherwise" + "comment": " 0 on success, error code otherwise" }, "description": "

Add an on-disk alternate to an existing Object DB.

\n", "comments": "

Note that the added path must point to an objects, not to a full repository, to use it as an alternate store.

\n\n

Alternate backends are always checked for objects after all the main backends have been exhausted.

\n\n

Writing is disabled on alternate backends.

\n", @@ -12205,18 +12604,18 @@ "group": "odb", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_odb_free-20" + "ex/v1.3.0/cat-file.html#git_odb_free-20" ], "general.c": [ - "ex/HEAD/general.html#git_odb_free-41" + "ex/v1.3.0/general.html#git_odb_free-41" ] } }, "git_odb_read": { "type": "function", "file": "git2/odb.h", - "line": 101, - "lineto": 101, + "line": 100, + "lineto": 100, "args": [ { "name": "out", @@ -12238,25 +12637,25 @@ "sig": "git_odb_object **::git_odb *::const git_oid *", "return": { "type": "int", - "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database." + "comment": " 0 if the object was read, GIT_ENOTFOUND if the object is\n not in the database." }, "description": "

Read an object from the database.

\n", "comments": "

This method queries all available ODB backends trying to read the given OID.

\n\n

The returned object is reference counted and internally cached, so it should be closed by the user once it's no longer in use.

\n", "group": "odb", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_odb_read-21" + "ex/v1.3.0/cat-file.html#git_odb_read-21" ], "general.c": [ - "ex/HEAD/general.html#git_odb_read-42" + "ex/v1.3.0/general.html#git_odb_read-42" ] } }, "git_odb_read_prefix": { "type": "function", "file": "git2/odb.h", - "line": 130, - "lineto": 130, + "line": 128, + "lineto": 128, "args": [ { "name": "out", @@ -12283,7 +12682,7 @@ "sig": "git_odb_object **::git_odb *::const git_oid *::size_t", "return": { "type": "int", - "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database.\n - GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix)" + "comment": " 0 if the object was read, GIT_ENOTFOUND if the object is not in the\n database. GIT_EAMBIGUOUS if the prefix is ambiguous\n (several objects match the prefix)" }, "description": "

Read an object from the database, given a prefix\n of its identifier.

\n", "comments": "

This method queries all available ODB backends trying to match the 'len' first hexadecimal characters of the 'short_id'. The remaining (GIT_OID_HEXSZ-len)*4 bits of 'short_id' must be 0s. 'len' must be at least GIT_OID_MINPREFIXLEN, and the prefix must be long enough to identify a unique object in all the backends; the method will fail otherwise.

\n\n

The returned object is reference counted and internally cached, so it should be closed by the user once it's no longer in use.

\n", @@ -12292,8 +12691,8 @@ "git_odb_read_header": { "type": "function", "file": "git2/odb.h", - "line": 150, - "lineto": 150, + "line": 147, + "lineto": 147, "args": [ { "name": "len_out", @@ -12320,7 +12719,7 @@ "sig": "size_t *::git_object_t *::git_odb *::const git_oid *", "return": { "type": "int", - "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database." + "comment": " 0 if the object was read, GIT_ENOTFOUND if the object is not\n in the database." }, "description": "

Read the header of an object from the database, without\n reading its full contents.

\n", "comments": "

The header includes the length and the type of an object.

\n\n

Note that most backends do not support reading only the header of an object, so the whole object will be read and then the header will be returned.

\n", @@ -12329,8 +12728,8 @@ "git_odb_exists": { "type": "function", "file": "git2/odb.h", - "line": 161, - "lineto": 161, + "line": 156, + "lineto": 156, "args": [ { "name": "db", @@ -12347,7 +12746,7 @@ "sig": "git_odb *::const git_oid *", "return": { "type": "int", - "comment": " - 1, if the object was found\n - 0, otherwise" + "comment": " 1 if the object was found, 0 otherwise" }, "description": "

Determine if the given object can be found in the object database.

\n", "comments": "", @@ -12356,8 +12755,8 @@ "git_odb_exists_prefix": { "type": "function", "file": "git2/odb.h", - "line": 174, - "lineto": 175, + "line": 169, + "lineto": 170, "args": [ { "name": "out", @@ -12393,8 +12792,8 @@ "git_odb_expand_ids": { "type": "function", "file": "git2/odb.h", - "line": 216, - "lineto": 219, + "line": 211, + "lineto": 214, "args": [ { "name": "db", @@ -12425,8 +12824,8 @@ "git_odb_refresh": { "type": "function", "file": "git2/odb.h", - "line": 239, - "lineto": 239, + "line": 234, + "lineto": 234, "args": [ { "name": "db", @@ -12447,8 +12846,8 @@ "git_odb_foreach": { "type": "function", "file": "git2/odb.h", - "line": 254, - "lineto": 254, + "line": 249, + "lineto": 249, "args": [ { "name": "db", @@ -12479,8 +12878,8 @@ "git_odb_write": { "type": "function", "file": "git2/odb.h", - "line": 274, - "lineto": 274, + "line": 269, + "lineto": 269, "args": [ { "name": "out", @@ -12519,15 +12918,15 @@ "group": "odb", "examples": { "general.c": [ - "ex/HEAD/general.html#git_odb_write-43" + "ex/v1.3.0/general.html#git_odb_write-43" ] } }, "git_odb_open_wstream": { "type": "function", "file": "git2/odb.h", - "line": 297, - "lineto": 297, + "line": 292, + "lineto": 292, "args": [ { "name": "out", @@ -12563,8 +12962,8 @@ "git_odb_stream_write": { "type": "function", "file": "git2/odb.h", - "line": 310, - "lineto": 310, + "line": 305, + "lineto": 305, "args": [ { "name": "stream", @@ -12586,7 +12985,7 @@ "sig": "git_odb_stream *::const char *::size_t", "return": { "type": "int", - "comment": " 0 if the write succeeded; error code otherwise" + "comment": " 0 if the write succeeded, error code otherwise" }, "description": "

Write to an odb stream

\n", "comments": "

This method will fail if the total number of received bytes exceeds the size declared with git_odb_open_wstream()

\n", @@ -12595,8 +12994,8 @@ "git_odb_stream_finalize_write": { "type": "function", "file": "git2/odb.h", - "line": 325, - "lineto": 325, + "line": 320, + "lineto": 320, "args": [ { "name": "out", @@ -12613,7 +13012,7 @@ "sig": "git_oid *::git_odb_stream *", "return": { "type": "int", - "comment": " 0 on success; an error code otherwise" + "comment": " 0 on success, an error code otherwise" }, "description": "

Finish writing to an odb stream

\n", "comments": "

The object will take its final name and will be available to the odb.

\n\n

This method will fail if the total number of received bytes differs from the size declared with git_odb_open_wstream()

\n", @@ -12622,8 +13021,8 @@ "git_odb_stream_read": { "type": "function", "file": "git2/odb.h", - "line": 332, - "lineto": 332, + "line": 327, + "lineto": 327, "args": [ { "name": "stream", @@ -12654,8 +13053,8 @@ "git_odb_stream_free": { "type": "function", "file": "git2/odb.h", - "line": 339, - "lineto": 339, + "line": 334, + "lineto": 334, "args": [ { "name": "stream", @@ -12676,8 +13075,8 @@ "git_odb_open_rstream": { "type": "function", "file": "git2/odb.h", - "line": 367, - "lineto": 372, + "line": 362, + "lineto": 367, "args": [ { "name": "out", @@ -12709,7 +13108,7 @@ "sig": "git_odb_stream **::size_t *::git_object_t *::git_odb *::const git_oid *", "return": { "type": "int", - "comment": " 0 if the stream was created; error code otherwise" + "comment": " 0 if the stream was created, error code otherwise" }, "description": "

Open a stream to read an object from the ODB

\n", "comments": "

Note that most backends do not support streaming reads because they store their objects as compressed/delta'ed blobs.

\n\n

It's recommended to use git_odb_read instead, which is assured to work on all backends.

\n\n

The returned stream will be of type GIT_STREAM_RDONLY and will have the following methods:

\n\n
    - stream->read: read `n` bytes from the stream      - stream->free: free the stream\n
\n\n

The stream must always be free'd or will leak memory.

\n", @@ -12718,8 +13117,8 @@ "git_odb_write_pack": { "type": "function", "file": "git2/odb.h", - "line": 392, - "lineto": 396, + "line": 387, + "lineto": 391, "args": [ { "name": "out", @@ -12752,11 +13151,33 @@ "comments": "

If the ODB layer understands pack files, then the given packfile will likely be streamed directly to disk (and a corresponding index created). If the ODB layer does not understand pack files, the objects will be stored in whatever format the ODB layer uses.

\n", "group": "odb" }, + "git_odb_write_multi_pack_index": { + "type": "function", + "file": "git2/odb.h", + "line": 404, + "lineto": 405, + "args": [ + { + "name": "db", + "type": "git_odb *", + "comment": "object database where the `multi-pack-index` file will be written." + } + ], + "argline": "git_odb *db", + "sig": "git_odb *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Write a multi-pack-index file from all the .pack files in the ODB.

\n", + "comments": "

If the ODB layer understands pack files, then this will create a file called multi-pack-index next to the .pack and .idx files, which will contain an index of all objects stored in .pack files. This will allow for O(log n) lookup for n objects (regardless of how many packfiles there exist).

\n", + "group": "odb" + }, "git_odb_hash": { "type": "function", "file": "git2/odb.h", - "line": 410, - "lineto": 410, + "line": 419, + "lineto": 419, "args": [ { "name": "out", @@ -12792,8 +13213,8 @@ "git_odb_hashfile": { "type": "function", "file": "git2/odb.h", - "line": 425, - "lineto": 425, + "line": 434, + "lineto": 434, "args": [ { "name": "out", @@ -12824,8 +13245,8 @@ "git_odb_object_dup": { "type": "function", "file": "git2/odb.h", - "line": 439, - "lineto": 439, + "line": 448, + "lineto": 448, "args": [ { "name": "dest", @@ -12851,8 +13272,8 @@ "git_odb_object_free": { "type": "function", "file": "git2/odb.h", - "line": 449, - "lineto": 449, + "line": 458, + "lineto": 458, "args": [ { "name": "object", @@ -12871,18 +13292,18 @@ "group": "odb", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_odb_object_free-22" + "ex/v1.3.0/cat-file.html#git_odb_object_free-22" ], "general.c": [ - "ex/HEAD/general.html#git_odb_object_free-44" + "ex/v1.3.0/general.html#git_odb_object_free-44" ] } }, "git_odb_object_id": { "type": "function", "file": "git2/odb.h", - "line": 459, - "lineto": 459, + "line": 468, + "lineto": 468, "args": [ { "name": "object", @@ -12903,8 +13324,8 @@ "git_odb_object_data": { "type": "function", "file": "git2/odb.h", - "line": 472, - "lineto": 472, + "line": 481, + "lineto": 481, "args": [ { "name": "object", @@ -12923,15 +13344,15 @@ "group": "odb", "examples": { "general.c": [ - "ex/HEAD/general.html#git_odb_object_data-45" + "ex/v1.3.0/general.html#git_odb_object_data-45" ] } }, "git_odb_object_size": { "type": "function", "file": "git2/odb.h", - "line": 483, - "lineto": 483, + "line": 492, + "lineto": 492, "args": [ { "name": "object", @@ -12950,18 +13371,18 @@ "group": "odb", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_odb_object_size-23" + "ex/v1.3.0/cat-file.html#git_odb_object_size-23" ], "general.c": [ - "ex/HEAD/general.html#git_odb_object_size-46" + "ex/v1.3.0/general.html#git_odb_object_size-46" ] } }, "git_odb_object_type": { "type": "function", "file": "git2/odb.h", - "line": 491, - "lineto": 491, + "line": 500, + "lineto": 500, "args": [ { "name": "object", @@ -12980,15 +13401,15 @@ "group": "odb", "examples": { "general.c": [ - "ex/HEAD/general.html#git_odb_object_type-47" + "ex/v1.3.0/general.html#git_odb_object_type-47" ] } }, "git_odb_add_backend": { "type": "function", "file": "git2/odb.h", - "line": 506, - "lineto": 506, + "line": 515, + "lineto": 515, "args": [ { "name": "odb", @@ -13010,7 +13431,7 @@ "sig": "git_odb *::git_odb_backend *::int", "return": { "type": "int", - "comment": " 0 on success; error code otherwise" + "comment": " 0 on success, error code otherwise" }, "description": "

Add a custom backend to an existing Object DB

\n", "comments": "

The backends are checked in relative ordering, based on the value of the priority parameter.

\n\n

Read for more information.

\n", @@ -13019,8 +13440,8 @@ "git_odb_add_alternate": { "type": "function", "file": "git2/odb.h", - "line": 527, - "lineto": 527, + "line": 536, + "lineto": 536, "args": [ { "name": "odb", @@ -13042,7 +13463,7 @@ "sig": "git_odb *::git_odb_backend *::int", "return": { "type": "int", - "comment": " 0 on success; error code otherwise" + "comment": " 0 on success, error code otherwise" }, "description": "

Add a custom backend to an existing Object DB; this\n backend will work as an alternate.

\n", "comments": "

Alternate backends are always checked for objects after all the main backends have been exhausted.

\n\n

The backends are checked in relative ordering, based on the value of the priority parameter.

\n\n

Writing is disabled on alternate backends.

\n\n

Read for more information.

\n", @@ -13051,8 +13472,8 @@ "git_odb_num_backends": { "type": "function", "file": "git2/odb.h", - "line": 535, - "lineto": 535, + "line": 544, + "lineto": 544, "args": [ { "name": "odb", @@ -13073,8 +13494,8 @@ "git_odb_get_backend": { "type": "function", "file": "git2/odb.h", - "line": 545, - "lineto": 545, + "line": 554, + "lineto": 554, "args": [ { "name": "out", @@ -13096,12 +13517,39 @@ "sig": "git_odb_backend **::git_odb *::size_t", "return": { "type": "int", - "comment": " 0 on success; GIT_ENOTFOUND if pos is invalid; other errors \n<\n 0" + "comment": " 0 on success, GIT_ENOTFOUND if pos is invalid, other errors \n<\n 0" }, "description": "

Lookup an ODB backend object by index

\n", "comments": "", "group": "odb" }, + "git_odb_set_commit_graph": { + "type": "function", + "file": "git2/odb.h", + "line": 569, + "lineto": 569, + "args": [ + { + "name": "odb", + "type": "git_odb *", + "comment": "object database" + }, + { + "name": "cgraph", + "type": "git_commit_graph *", + "comment": "the git commit-graph" + } + ], + "argline": "git_odb *odb, git_commit_graph *cgraph", + "sig": "git_odb *::git_commit_graph *", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "

Set the git commit-graph for the ODB.

\n", + "comments": "

After a successfull call, the ownership of the cgraph parameter will be transferred to libgit2, and the caller should not free it.

\n\n

The commit-graph can also be unset by explicitly passing NULL as the cgraph parameter.

\n", + "group": "odb" + }, "git_odb_backend_pack": { "type": "function", "file": "git2/odb_backend.h", @@ -13231,14 +13679,14 @@ "group": "oid", "examples": { "general.c": [ - "ex/HEAD/general.html#git_oid_fromstr-48", - "ex/HEAD/general.html#git_oid_fromstr-49", - "ex/HEAD/general.html#git_oid_fromstr-50", - "ex/HEAD/general.html#git_oid_fromstr-51", - "ex/HEAD/general.html#git_oid_fromstr-52", - "ex/HEAD/general.html#git_oid_fromstr-53", - "ex/HEAD/general.html#git_oid_fromstr-54", - "ex/HEAD/general.html#git_oid_fromstr-55" + "ex/v1.3.0/general.html#git_oid_fromstr-48", + "ex/v1.3.0/general.html#git_oid_fromstr-49", + "ex/v1.3.0/general.html#git_oid_fromstr-50", + "ex/v1.3.0/general.html#git_oid_fromstr-51", + "ex/v1.3.0/general.html#git_oid_fromstr-52", + "ex/v1.3.0/general.html#git_oid_fromstr-53", + "ex/v1.3.0/general.html#git_oid_fromstr-54", + "ex/v1.3.0/general.html#git_oid_fromstr-55" ] } }, @@ -13356,18 +13804,18 @@ "group": "oid", "examples": { "fetch.c": [ - "ex/HEAD/fetch.html#git_oid_fmt-1", - "ex/HEAD/fetch.html#git_oid_fmt-2" + "ex/v1.3.0/fetch.html#git_oid_fmt-1", + "ex/v1.3.0/fetch.html#git_oid_fmt-2" ], "general.c": [ - "ex/HEAD/general.html#git_oid_fmt-56", - "ex/HEAD/general.html#git_oid_fmt-57", - "ex/HEAD/general.html#git_oid_fmt-58", - "ex/HEAD/general.html#git_oid_fmt-59", - "ex/HEAD/general.html#git_oid_fmt-60" + "ex/v1.3.0/general.html#git_oid_fmt-56", + "ex/v1.3.0/general.html#git_oid_fmt-57", + "ex/v1.3.0/general.html#git_oid_fmt-58", + "ex/v1.3.0/general.html#git_oid_fmt-59", + "ex/v1.3.0/general.html#git_oid_fmt-60" ], "ls-remote.c": [ - "ex/HEAD/ls-remote.html#git_oid_fmt-1" + "ex/v1.3.0/ls-remote.html#git_oid_fmt-1" ] } }, @@ -13453,8 +13901,8 @@ "group": "oid", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_oid_tostr_s-19", - "ex/HEAD/merge.html#git_oid_tostr_s-20" + "ex/v1.3.0/merge.html#git_oid_tostr_s-19", + "ex/v1.3.0/merge.html#git_oid_tostr_s-20" ] } }, @@ -13491,25 +13939,25 @@ "group": "oid", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_oid_tostr-16", - "ex/HEAD/blame.html#git_oid_tostr-17" + "ex/v1.3.0/blame.html#git_oid_tostr-16", + "ex/v1.3.0/blame.html#git_oid_tostr-17" ], "cat-file.c": [ - "ex/HEAD/cat-file.html#git_oid_tostr-24", - "ex/HEAD/cat-file.html#git_oid_tostr-25", - "ex/HEAD/cat-file.html#git_oid_tostr-26", - "ex/HEAD/cat-file.html#git_oid_tostr-27", - "ex/HEAD/cat-file.html#git_oid_tostr-28" + "ex/v1.3.0/cat-file.html#git_oid_tostr-24", + "ex/v1.3.0/cat-file.html#git_oid_tostr-25", + "ex/v1.3.0/cat-file.html#git_oid_tostr-26", + "ex/v1.3.0/cat-file.html#git_oid_tostr-27", + "ex/v1.3.0/cat-file.html#git_oid_tostr-28" ], "log.c": [ - "ex/HEAD/log.html#git_oid_tostr-38", - "ex/HEAD/log.html#git_oid_tostr-39" + "ex/v1.3.0/log.html#git_oid_tostr-38", + "ex/v1.3.0/log.html#git_oid_tostr-39" ], "rev-parse.c": [ - "ex/HEAD/rev-parse.html#git_oid_tostr-10", - "ex/HEAD/rev-parse.html#git_oid_tostr-11", - "ex/HEAD/rev-parse.html#git_oid_tostr-12", - "ex/HEAD/rev-parse.html#git_oid_tostr-13" + "ex/v1.3.0/rev-parse.html#git_oid_tostr-10", + "ex/v1.3.0/rev-parse.html#git_oid_tostr-11", + "ex/v1.3.0/rev-parse.html#git_oid_tostr-12", + "ex/v1.3.0/rev-parse.html#git_oid_tostr-13" ] } }, @@ -13541,9 +13989,9 @@ "group": "oid", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_oid_cpy-18", - "ex/HEAD/blame.html#git_oid_cpy-19", - "ex/HEAD/blame.html#git_oid_cpy-20" + "ex/v1.3.0/blame.html#git_oid_cpy-18", + "ex/v1.3.0/blame.html#git_oid_cpy-19", + "ex/v1.3.0/blame.html#git_oid_cpy-20" ] } }, @@ -13710,10 +14158,10 @@ "group": "oid", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_oid_is_zero-21" + "ex/v1.3.0/blame.html#git_oid_is_zero-21" ], "fetch.c": [ - "ex/HEAD/fetch.html#git_oid_is_zero-3" + "ex/v1.3.0/fetch.html#git_oid_is_zero-3" ] } }, @@ -13788,11 +14236,11 @@ "comments": "", "group": "oid" }, - "git_oidarray_free": { + "git_oidarray_dispose": { "type": "function", "file": "git2/oidarray.h", - "line": 34, - "lineto": 34, + "line": 31, + "lineto": 31, "args": [ { "name": "array", @@ -13806,8 +14254,8 @@ "type": "void", "comment": null }, - "description": "

Free the OID array

\n", - "comments": "

This method must (and must only) be called on git_oidarray objects where the array is allocated by the library. Not doing so, will result in a memory leak.

\n\n

This does not free the git_oidarray itself, since the library will never allocate that object directly itself (it is more commonly embedded inside another struct or created on the stack).

\n", + "description": "

Free the object IDs contained in an oid_array. This method should\n be called on git_oidarray objects that were provided by the\n library. Not doing so will result in a memory leak.

\n", + "comments": "

This does not free the git_oidarray itself, since the library will never allocate that object directly itself.

\n", "group": "oidarray" }, "git_packbuilder_new": { @@ -14441,7 +14889,7 @@ "group": "patch", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_patch_from_buffers-15" + "ex/v1.3.0/diff.html#git_patch_from_buffers-15" ] } }, @@ -14468,7 +14916,7 @@ "group": "patch", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_patch_free-16" + "ex/v1.3.0/diff.html#git_patch_free-16" ] } }, @@ -14751,7 +15199,7 @@ "group": "patch", "examples": { "diff.c": [ - "ex/HEAD/diff.html#git_patch_to_buf-17" + "ex/v1.3.0/diff.html#git_patch_to_buf-17" ] } }, @@ -14783,7 +15231,7 @@ "group": "pathspec", "examples": { "log.c": [ - "ex/HEAD/log.html#git_pathspec_new-40" + "ex/v1.3.0/log.html#git_pathspec_new-40" ] } }, @@ -14810,7 +15258,7 @@ "group": "pathspec", "examples": { "log.c": [ - "ex/HEAD/log.html#git_pathspec_free-41" + "ex/v1.3.0/log.html#git_pathspec_free-41" ] } }, @@ -14958,7 +15406,7 @@ "group": "pathspec", "examples": { "log.c": [ - "ex/HEAD/log.html#git_pathspec_match_tree-42" + "ex/v1.3.0/log.html#git_pathspec_match_tree-42" ] } }, @@ -15176,8 +15624,8 @@ "git_rebase_options_init": { "type": "function", "file": "git2/rebase.h", - "line": 175, - "lineto": 177, + "line": 199, + "lineto": 201, "args": [ { "name": "opts", @@ -15203,8 +15651,8 @@ "git_rebase_init": { "type": "function", "file": "git2/rebase.h", - "line": 196, - "lineto": 202, + "line": 220, + "lineto": 226, "args": [ { "name": "out", @@ -15250,8 +15698,8 @@ "git_rebase_open": { "type": "function", "file": "git2/rebase.h", - "line": 213, - "lineto": 216, + "line": 237, + "lineto": 240, "args": [ { "name": "out", @@ -15282,8 +15730,8 @@ "git_rebase_orig_head_name": { "type": "function", "file": "git2/rebase.h", - "line": 223, - "lineto": 223, + "line": 247, + "lineto": 247, "args": [ { "name": "rebase", @@ -15304,8 +15752,8 @@ "git_rebase_orig_head_id": { "type": "function", "file": "git2/rebase.h", - "line": 230, - "lineto": 230, + "line": 254, + "lineto": 254, "args": [ { "name": "rebase", @@ -15326,8 +15774,8 @@ "git_rebase_onto_name": { "type": "function", "file": "git2/rebase.h", - "line": 237, - "lineto": 237, + "line": 261, + "lineto": 261, "args": [ { "name": "rebase", @@ -15348,8 +15796,8 @@ "git_rebase_onto_id": { "type": "function", "file": "git2/rebase.h", - "line": 244, - "lineto": 244, + "line": 268, + "lineto": 268, "args": [ { "name": "rebase", @@ -15370,8 +15818,8 @@ "git_rebase_operation_entrycount": { "type": "function", "file": "git2/rebase.h", - "line": 252, - "lineto": 252, + "line": 276, + "lineto": 276, "args": [ { "name": "rebase", @@ -15392,8 +15840,8 @@ "git_rebase_operation_current": { "type": "function", "file": "git2/rebase.h", - "line": 263, - "lineto": 263, + "line": 287, + "lineto": 287, "args": [ { "name": "rebase", @@ -15414,8 +15862,8 @@ "git_rebase_operation_byindex": { "type": "function", "file": "git2/rebase.h", - "line": 272, - "lineto": 274, + "line": 296, + "lineto": 298, "args": [ { "name": "rebase", @@ -15441,8 +15889,8 @@ "git_rebase_next": { "type": "function", "file": "git2/rebase.h", - "line": 287, - "lineto": 289, + "line": 311, + "lineto": 313, "args": [ { "name": "operation", @@ -15468,8 +15916,8 @@ "git_rebase_inmemory_index": { "type": "function", "file": "git2/rebase.h", - "line": 302, - "lineto": 304, + "line": 326, + "lineto": 328, "args": [ { "name": "index", @@ -15495,8 +15943,8 @@ "git_rebase_commit": { "type": "function", "file": "git2/rebase.h", - "line": 328, - "lineto": 334, + "line": 352, + "lineto": 358, "args": [ { "name": "id", @@ -15542,8 +15990,8 @@ "git_rebase_abort": { "type": "function", "file": "git2/rebase.h", - "line": 344, - "lineto": 344, + "line": 368, + "lineto": 368, "args": [ { "name": "rebase", @@ -15564,8 +16012,8 @@ "git_rebase_finish": { "type": "function", "file": "git2/rebase.h", - "line": 354, - "lineto": 356, + "line": 378, + "lineto": 380, "args": [ { "name": "rebase", @@ -15591,8 +16039,8 @@ "git_rebase_free": { "type": "function", "file": "git2/rebase.h", - "line": 363, - "lineto": 363, + "line": 387, + "lineto": 387, "args": [ { "name": "rebase", @@ -16082,14 +16530,14 @@ "group": "reference", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_reference_lookup-15", - "ex/HEAD/checkout.html#git_reference_lookup-16" + "ex/v1.3.0/checkout.html#git_reference_lookup-15", + "ex/v1.3.0/checkout.html#git_reference_lookup-16" ], "general.c": [ - "ex/HEAD/general.html#git_reference_lookup-61" + "ex/v1.3.0/general.html#git_reference_lookup-61" ], "merge.c": [ - "ex/HEAD/merge.html#git_reference_lookup-21" + "ex/v1.3.0/merge.html#git_reference_lookup-21" ] } }, @@ -16158,15 +16606,15 @@ "group": "reference", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_reference_dwim-22" + "ex/v1.3.0/merge.html#git_reference_dwim-22" ] } }, "git_reference_symbolic_create_matching": { "type": "function", "file": "git2/refs.h", - "line": 109, - "lineto": 109, + "line": 112, + "lineto": 112, "args": [ { "name": "out", @@ -16211,14 +16659,14 @@ "comment": " 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code" }, "description": "

Conditionally create a new symbolic reference.

\n", - "comments": "

A symbolic reference is a reference name that refers to another reference name. If the other name moves, the symbolic name will move, too. As a simple example, the "HEAD" reference might refer to "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores, and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). 2. Names prefixed with "refs/" can be almost anything. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.
  2. \n
\n\n

This function will return an error if a reference already exists with the given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does not belong in the standard set (HEAD, branches and remote-tracking branches) and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time of updating does not match the one passed through current_value (i.e. if the ref has changed since the user read it).

\n", + "comments": "

A symbolic reference is a reference name that refers to another reference name. If the other name moves, the symbolic name will move, too. As a simple example, the "HEAD" reference might refer to "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores, and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). 2. Names prefixed with "refs/" can be almost anything. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.
  2. \n
\n\n

This function will return an error if a reference already exists with the given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does not belong in the standard set (HEAD, branches and remote-tracking branches) and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time of updating does not match the one passed through current_value (i.e. if the ref has changed since the user read it).

\n\n

If current_value is all zeros, this function will return GIT_EMODIFIED if the ref already exists.

\n", "group": "reference" }, "git_reference_symbolic_create": { "type": "function", "file": "git2/refs.h", - "line": 145, - "lineto": 145, + "line": 148, + "lineto": 148, "args": [ { "name": "out", @@ -16264,8 +16712,8 @@ "git_reference_create": { "type": "function", "file": "git2/refs.h", - "line": 182, - "lineto": 182, + "line": 185, + "lineto": 185, "args": [ { "name": "out", @@ -16309,15 +16757,15 @@ "group": "reference", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_reference_create-23" + "ex/v1.3.0/merge.html#git_reference_create-23" ] } }, "git_reference_create_matching": { "type": "function", "file": "git2/refs.h", - "line": 225, - "lineto": 225, + "line": 228, + "lineto": 228, "args": [ { "name": "out", @@ -16368,8 +16816,8 @@ "git_reference_target": { "type": "function", "file": "git2/refs.h", - "line": 240, - "lineto": 240, + "line": 243, + "lineto": 243, "args": [ { "name": "ref", @@ -16388,15 +16836,15 @@ "group": "reference", "examples": { "general.c": [ - "ex/HEAD/general.html#git_reference_target-62" + "ex/v1.3.0/general.html#git_reference_target-62" ] } }, "git_reference_target_peel": { "type": "function", "file": "git2/refs.h", - "line": 251, - "lineto": 251, + "line": 254, + "lineto": 254, "args": [ { "name": "ref", @@ -16417,8 +16865,8 @@ "git_reference_symbolic_target": { "type": "function", "file": "git2/refs.h", - "line": 261, - "lineto": 261, + "line": 264, + "lineto": 264, "args": [ { "name": "ref", @@ -16437,18 +16885,18 @@ "group": "reference", "examples": { "general.c": [ - "ex/HEAD/general.html#git_reference_symbolic_target-63" + "ex/v1.3.0/general.html#git_reference_symbolic_target-63" ], "merge.c": [ - "ex/HEAD/merge.html#git_reference_symbolic_target-24" + "ex/v1.3.0/merge.html#git_reference_symbolic_target-24" ] } }, "git_reference_type": { "type": "function", "file": "git2/refs.h", - "line": 271, - "lineto": 271, + "line": 274, + "lineto": 274, "args": [ { "name": "ref", @@ -16467,15 +16915,15 @@ "group": "reference", "examples": { "general.c": [ - "ex/HEAD/general.html#git_reference_type-64" + "ex/v1.3.0/general.html#git_reference_type-64" ] } }, "git_reference_name": { "type": "function", "file": "git2/refs.h", - "line": 281, - "lineto": 281, + "line": 284, + "lineto": 284, "args": [ { "name": "ref", @@ -16494,18 +16942,18 @@ "group": "reference", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_reference_name-17" + "ex/v1.3.0/checkout.html#git_reference_name-17" ], "merge.c": [ - "ex/HEAD/merge.html#git_reference_name-25" + "ex/v1.3.0/merge.html#git_reference_name-25" ] } }, "git_reference_resolve": { "type": "function", "file": "git2/refs.h", - "line": 299, - "lineto": 299, + "line": 302, + "lineto": 302, "args": [ { "name": "out", @@ -16531,8 +16979,8 @@ "git_reference_owner": { "type": "function", "file": "git2/refs.h", - "line": 307, - "lineto": 307, + "line": 310, + "lineto": 310, "args": [ { "name": "ref", @@ -16553,8 +17001,8 @@ "git_reference_symbolic_set_target": { "type": "function", "file": "git2/refs.h", - "line": 329, - "lineto": 333, + "line": 332, + "lineto": 336, "args": [ { "name": "out", @@ -16590,8 +17038,8 @@ "git_reference_set_target": { "type": "function", "file": "git2/refs.h", - "line": 349, - "lineto": 353, + "line": 352, + "lineto": 356, "args": [ { "name": "out", @@ -16625,15 +17073,15 @@ "group": "reference", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_reference_set_target-26" + "ex/v1.3.0/merge.html#git_reference_set_target-26" ] } }, "git_reference_rename": { "type": "function", "file": "git2/refs.h", - "line": 378, - "lineto": 383, + "line": 381, + "lineto": 386, "args": [ { "name": "new_ref", @@ -16674,8 +17122,8 @@ "git_reference_delete": { "type": "function", "file": "git2/refs.h", - "line": 398, - "lineto": 398, + "line": 401, + "lineto": 401, "args": [ { "name": "ref", @@ -16696,8 +17144,8 @@ "git_reference_remove": { "type": "function", "file": "git2/refs.h", - "line": 409, - "lineto": 409, + "line": 412, + "lineto": 412, "args": [ { "name": "repo", @@ -16723,8 +17171,8 @@ "git_reference_list": { "type": "function", "file": "git2/refs.h", - "line": 423, - "lineto": 423, + "line": 426, + "lineto": 426, "args": [ { "name": "array", @@ -16748,15 +17196,15 @@ "group": "reference", "examples": { "general.c": [ - "ex/HEAD/general.html#git_reference_list-65" + "ex/v1.3.0/general.html#git_reference_list-65" ] } }, "git_reference_foreach": { "type": "function", "file": "git2/refs.h", - "line": 463, - "lineto": 466, + "line": 466, + "lineto": 469, "args": [ { "name": "repo", @@ -16787,8 +17235,8 @@ "git_reference_foreach_name": { "type": "function", "file": "git2/refs.h", - "line": 481, - "lineto": 484, + "line": 484, + "lineto": 487, "args": [ { "name": "repo", @@ -16819,8 +17267,8 @@ "git_reference_dup": { "type": "function", "file": "git2/refs.h", - "line": 495, - "lineto": 495, + "line": 498, + "lineto": 498, "args": [ { "name": "dest", @@ -16846,8 +17294,8 @@ "git_reference_free": { "type": "function", "file": "git2/refs.h", - "line": 502, - "lineto": 502, + "line": 505, + "lineto": 505, "args": [ { "name": "ref", @@ -16866,28 +17314,28 @@ "group": "reference", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_reference_free-18", - "ex/HEAD/checkout.html#git_reference_free-19", - "ex/HEAD/checkout.html#git_reference_free-20" + "ex/v1.3.0/checkout.html#git_reference_free-18", + "ex/v1.3.0/checkout.html#git_reference_free-19", + "ex/v1.3.0/checkout.html#git_reference_free-20" ], "general.c": [ - "ex/HEAD/general.html#git_reference_free-66" + "ex/v1.3.0/general.html#git_reference_free-66" ], "merge.c": [ - "ex/HEAD/merge.html#git_reference_free-27", - "ex/HEAD/merge.html#git_reference_free-28", - "ex/HEAD/merge.html#git_reference_free-29" + "ex/v1.3.0/merge.html#git_reference_free-27", + "ex/v1.3.0/merge.html#git_reference_free-28", + "ex/v1.3.0/merge.html#git_reference_free-29" ], "status.c": [ - "ex/HEAD/status.html#git_reference_free-1" + "ex/v1.3.0/status.html#git_reference_free-1" ] } }, "git_reference_cmp": { "type": "function", "file": "git2/refs.h", - "line": 511, - "lineto": 513, + "line": 514, + "lineto": 516, "args": [ { "name": "ref1", @@ -16913,8 +17361,8 @@ "git_reference_iterator_new": { "type": "function", "file": "git2/refs.h", - "line": 522, - "lineto": 524, + "line": 525, + "lineto": 527, "args": [ { "name": "out", @@ -16940,8 +17388,8 @@ "git_reference_iterator_glob_new": { "type": "function", "file": "git2/refs.h", - "line": 535, - "lineto": 538, + "line": 538, + "lineto": 541, "args": [ { "name": "out", @@ -16972,8 +17420,8 @@ "git_reference_next": { "type": "function", "file": "git2/refs.h", - "line": 547, - "lineto": 547, + "line": 550, + "lineto": 550, "args": [ { "name": "out", @@ -16999,8 +17447,8 @@ "git_reference_next_name": { "type": "function", "file": "git2/refs.h", - "line": 560, - "lineto": 560, + "line": 563, + "lineto": 563, "args": [ { "name": "out", @@ -17026,8 +17474,8 @@ "git_reference_iterator_free": { "type": "function", "file": "git2/refs.h", - "line": 567, - "lineto": 567, + "line": 570, + "lineto": 570, "args": [ { "name": "iter", @@ -17048,8 +17496,8 @@ "git_reference_foreach_glob": { "type": "function", "file": "git2/refs.h", - "line": 587, - "lineto": 591, + "line": 590, + "lineto": 594, "args": [ { "name": "repo", @@ -17085,8 +17533,8 @@ "git_reference_has_log": { "type": "function", "file": "git2/refs.h", - "line": 601, - "lineto": 601, + "line": 604, + "lineto": 604, "args": [ { "name": "repo", @@ -17112,8 +17560,8 @@ "git_reference_ensure_log": { "type": "function", "file": "git2/refs.h", - "line": 613, - "lineto": 613, + "line": 616, + "lineto": 616, "args": [ { "name": "repo", @@ -17139,8 +17587,8 @@ "git_reference_is_branch": { "type": "function", "file": "git2/refs.h", - "line": 623, - "lineto": 623, + "line": 626, + "lineto": 626, "args": [ { "name": "ref", @@ -17161,8 +17609,8 @@ "git_reference_is_remote": { "type": "function", "file": "git2/refs.h", - "line": 633, - "lineto": 633, + "line": 636, + "lineto": 636, "args": [ { "name": "ref", @@ -17181,15 +17629,15 @@ "group": "reference", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_reference_is_remote-21" + "ex/v1.3.0/checkout.html#git_reference_is_remote-21" ] } }, "git_reference_is_tag": { "type": "function", "file": "git2/refs.h", - "line": 643, - "lineto": 643, + "line": 646, + "lineto": 646, "args": [ { "name": "ref", @@ -17210,8 +17658,8 @@ "git_reference_is_note": { "type": "function", "file": "git2/refs.h", - "line": 653, - "lineto": 653, + "line": 656, + "lineto": 656, "args": [ { "name": "ref", @@ -17232,8 +17680,8 @@ "git_reference_normalize_name": { "type": "function", "file": "git2/refs.h", - "line": 709, - "lineto": 713, + "line": 712, + "lineto": 716, "args": [ { "name": "buffer_out", @@ -17269,8 +17717,8 @@ "git_reference_peel": { "type": "function", "file": "git2/refs.h", - "line": 730, - "lineto": 733, + "line": 733, + "lineto": 736, "args": [ { "name": "out", @@ -17299,15 +17747,15 @@ "group": "reference", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_reference_peel-30" + "ex/v1.3.0/merge.html#git_reference_peel-30" ] } }, "git_reference_name_is_valid": { "type": "function", "file": "git2/refs.h", - "line": 750, - "lineto": 750, + "line": 753, + "lineto": 753, "args": [ { "name": "valid", @@ -17333,8 +17781,8 @@ "git_reference_shorthand": { "type": "function", "file": "git2/refs.h", - "line": 764, - "lineto": 764, + "line": 767, + "lineto": 767, "args": [ { "name": "ref", @@ -17353,7 +17801,7 @@ "group": "reference", "examples": { "status.c": [ - "ex/HEAD/status.html#git_reference_shorthand-2" + "ex/v1.3.0/status.html#git_reference_shorthand-2" ] } }, @@ -17677,7 +18125,7 @@ "group": "remote", "examples": { "remote.c": [ - "ex/HEAD/remote.html#git_remote_create-1" + "ex/v1.3.0/remote.html#git_remote_create-1" ] } }, @@ -17815,10 +18263,10 @@ "group": "remote", "examples": { "fetch.c": [ - "ex/HEAD/fetch.html#git_remote_create_anonymous-4" + "ex/v1.3.0/fetch.html#git_remote_create_anonymous-4" ], "ls-remote.c": [ - "ex/HEAD/ls-remote.html#git_remote_create_anonymous-2" + "ex/v1.3.0/ls-remote.html#git_remote_create_anonymous-2" ] } }, @@ -17882,16 +18330,16 @@ "group": "remote", "examples": { "fetch.c": [ - "ex/HEAD/fetch.html#git_remote_lookup-5" + "ex/v1.3.0/fetch.html#git_remote_lookup-5" ], "ls-remote.c": [ - "ex/HEAD/ls-remote.html#git_remote_lookup-3" + "ex/v1.3.0/ls-remote.html#git_remote_lookup-3" ], "push.c": [ - "ex/HEAD/push.html#git_remote_lookup-1" + "ex/v1.3.0/push.html#git_remote_lookup-1" ], "remote.c": [ - "ex/HEAD/remote.html#git_remote_lookup-2" + "ex/v1.3.0/remote.html#git_remote_lookup-2" ] } }, @@ -17969,8 +18417,8 @@ "git_remote_url": { "type": "function", "file": "git2/remote.h", - "line": 220, - "lineto": 220, + "line": 221, + "lineto": 221, "args": [ { "name": "remote", @@ -17985,19 +18433,19 @@ "comment": " a pointer to the url" }, "description": "

Get the remote's url

\n", - "comments": "

If url.*.insteadOf has been configured for this URL, it will return the modified URL.

\n", + "comments": "

If url.*.insteadOf has been configured for this URL, it will return the modified URL. If git_remote_set_instance_pushurl has been called for this remote, then that URL will be returned.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/HEAD/remote.html#git_remote_url-3" + "ex/v1.3.0/remote.html#git_remote_url-3" ] } }, "git_remote_pushurl": { "type": "function", "file": "git2/remote.h", - "line": 231, - "lineto": 231, + "line": 233, + "lineto": 233, "args": [ { "name": "remote", @@ -18011,20 +18459,20 @@ "type": "const char *", "comment": " a pointer to the url or NULL if no special url for pushing is set" }, - "description": "

Get the remote's url for pushing

\n", - "comments": "

If url.*.pushInsteadOf has been configured for this URL, it will return the modified URL.

\n", + "description": "

Get the remote's url for pushing.

\n", + "comments": "

If url.*.pushInsteadOf has been configured for this URL, it will return the modified URL. If git_remote_set_instance_pushurl has been called for this remote, then that URL will be returned.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/HEAD/remote.html#git_remote_pushurl-4" + "ex/v1.3.0/remote.html#git_remote_pushurl-4" ] } }, "git_remote_set_url": { "type": "function", "file": "git2/remote.h", - "line": 244, - "lineto": 244, + "line": 246, + "lineto": 246, "args": [ { "name": "repo", @@ -18053,15 +18501,15 @@ "group": "remote", "examples": { "remote.c": [ - "ex/HEAD/remote.html#git_remote_set_url-5" + "ex/v1.3.0/remote.html#git_remote_set_url-5" ] } }, "git_remote_set_pushurl": { "type": "function", "file": "git2/remote.h", - "line": 257, - "lineto": 257, + "line": 260, + "lineto": 260, "args": [ { "name": "repo", @@ -18083,22 +18531,76 @@ "sig": "git_repository *::const char *::const char *", "return": { "type": "int", - "comment": null + "comment": " 0, or an error code" }, "description": "

Set the remote's url for pushing in the configuration.

\n", "comments": "

Remote objects already in memory will not be affected. This assumes the common case of a single-url remote and will otherwise return an error.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/HEAD/remote.html#git_remote_set_pushurl-6" + "ex/v1.3.0/remote.html#git_remote_set_pushurl-6" ] } }, - "git_remote_add_fetch": { + "git_remote_set_instance_url": { "type": "function", "file": "git2/remote.h", "line": 270, "lineto": 270, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote's name" + }, + { + "name": "url", + "type": "const char *", + "comment": "the url to set" + } + ], + "argline": "git_remote *remote, const char *url", + "sig": "git_remote *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error value" + }, + "description": "

Set the url for this particular url instance. The URL in the\n configuration will be ignored, and will not be changed.

\n", + "comments": "", + "group": "remote" + }, + "git_remote_set_instance_pushurl": { + "type": "function", + "file": "git2/remote.h", + "line": 280, + "lineto": 280, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote's name" + }, + { + "name": "url", + "type": "const char *", + "comment": "the url to set" + } + ], + "argline": "git_remote *remote, const char *url", + "sig": "git_remote *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error value" + }, + "description": "

Set the push url for this particular url instance. The URL in the\n configuration will be ignored, and will not be changed.

\n", + "comments": "", + "group": "remote" + }, + "git_remote_add_fetch": { + "type": "function", + "file": "git2/remote.h", + "line": 293, + "lineto": 293, "args": [ { "name": "repo", @@ -18129,8 +18631,8 @@ "git_remote_get_fetch_refspecs": { "type": "function", "file": "git2/remote.h", - "line": 281, - "lineto": 281, + "line": 304, + "lineto": 304, "args": [ { "name": "array", @@ -18156,8 +18658,8 @@ "git_remote_add_push": { "type": "function", "file": "git2/remote.h", - "line": 294, - "lineto": 294, + "line": 317, + "lineto": 317, "args": [ { "name": "repo", @@ -18188,8 +18690,8 @@ "git_remote_get_push_refspecs": { "type": "function", "file": "git2/remote.h", - "line": 305, - "lineto": 305, + "line": 328, + "lineto": 328, "args": [ { "name": "array", @@ -18215,8 +18717,8 @@ "git_remote_refspec_count": { "type": "function", "file": "git2/remote.h", - "line": 313, - "lineto": 313, + "line": 336, + "lineto": 336, "args": [ { "name": "remote", @@ -18237,8 +18739,8 @@ "git_remote_get_refspec": { "type": "function", "file": "git2/remote.h", - "line": 322, - "lineto": 322, + "line": 345, + "lineto": 345, "args": [ { "name": "remote", @@ -18264,8 +18766,8 @@ "git_remote_connect": { "type": "function", "file": "git2/remote.h", - "line": 339, - "lineto": 339, + "line": 362, + "lineto": 362, "args": [ { "name": "remote", @@ -18304,15 +18806,15 @@ "group": "remote", "examples": { "ls-remote.c": [ - "ex/HEAD/ls-remote.html#git_remote_connect-4" + "ex/v1.3.0/ls-remote.html#git_remote_connect-4" ] } }, "git_remote_ls": { "type": "function", "file": "git2/remote.h", - "line": 361, - "lineto": 361, + "line": 384, + "lineto": 384, "args": [ { "name": "out", @@ -18341,15 +18843,15 @@ "group": "remote", "examples": { "ls-remote.c": [ - "ex/HEAD/ls-remote.html#git_remote_ls-5" + "ex/v1.3.0/ls-remote.html#git_remote_ls-5" ] } }, "git_remote_connected": { "type": "function", "file": "git2/remote.h", - "line": 372, - "lineto": 372, + "line": 395, + "lineto": 395, "args": [ { "name": "remote", @@ -18370,8 +18872,8 @@ "git_remote_stop": { "type": "function", "file": "git2/remote.h", - "line": 383, - "lineto": 383, + "line": 406, + "lineto": 406, "args": [ { "name": "remote", @@ -18392,8 +18894,8 @@ "git_remote_disconnect": { "type": "function", "file": "git2/remote.h", - "line": 393, - "lineto": 393, + "line": 416, + "lineto": 416, "args": [ { "name": "remote", @@ -18414,8 +18916,8 @@ "git_remote_free": { "type": "function", "file": "git2/remote.h", - "line": 403, - "lineto": 403, + "line": 426, + "lineto": 426, "args": [ { "name": "remote", @@ -18434,22 +18936,22 @@ "group": "remote", "examples": { "fetch.c": [ - "ex/HEAD/fetch.html#git_remote_free-6", - "ex/HEAD/fetch.html#git_remote_free-7" + "ex/v1.3.0/fetch.html#git_remote_free-6", + "ex/v1.3.0/fetch.html#git_remote_free-7" ], "ls-remote.c": [ - "ex/HEAD/ls-remote.html#git_remote_free-6" + "ex/v1.3.0/ls-remote.html#git_remote_free-6" ], "remote.c": [ - "ex/HEAD/remote.html#git_remote_free-7" + "ex/v1.3.0/remote.html#git_remote_free-7" ] } }, "git_remote_list": { "type": "function", "file": "git2/remote.h", - "line": 414, - "lineto": 414, + "line": 437, + "lineto": 437, "args": [ { "name": "out", @@ -18473,18 +18975,18 @@ "group": "remote", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_remote_list-22" + "ex/v1.3.0/checkout.html#git_remote_list-22" ], "remote.c": [ - "ex/HEAD/remote.html#git_remote_list-8" + "ex/v1.3.0/remote.html#git_remote_list-8" ] } }, "git_remote_init_callbacks": { "type": "function", "file": "git2/remote.h", - "line": 601, - "lineto": 603, + "line": 651, + "lineto": 653, "args": [ { "name": "opts", @@ -18510,8 +19012,8 @@ "git_fetch_options_init": { "type": "function", "file": "git2/remote.h", - "line": 707, - "lineto": 709, + "line": 757, + "lineto": 759, "args": [ { "name": "opts", @@ -18537,8 +19039,8 @@ "git_push_options_init": { "type": "function", "file": "git2/remote.h", - "line": 757, - "lineto": 759, + "line": 807, + "lineto": 809, "args": [ { "name": "opts", @@ -18562,15 +19064,15 @@ "group": "push", "examples": { "push.c": [ - "ex/HEAD/push.html#git_push_options_init-2" + "ex/v1.3.0/push.html#git_push_options_init-2" ] } }, "git_remote_download": { "type": "function", "file": "git2/remote.h", - "line": 777, - "lineto": 777, + "line": 827, + "lineto": 827, "args": [ { "name": "remote", @@ -18601,8 +19103,8 @@ "git_remote_upload": { "type": "function", "file": "git2/remote.h", - "line": 791, - "lineto": 791, + "line": 841, + "lineto": 841, "args": [ { "name": "remote", @@ -18633,8 +19135,8 @@ "git_remote_update_tips": { "type": "function", "file": "git2/remote.h", - "line": 807, - "lineto": 812, + "line": 857, + "lineto": 862, "args": [ { "name": "remote", @@ -18675,8 +19177,8 @@ "git_remote_fetch": { "type": "function", "file": "git2/remote.h", - "line": 828, - "lineto": 832, + "line": 878, + "lineto": 882, "args": [ { "name": "remote", @@ -18710,15 +19212,15 @@ "group": "remote", "examples": { "fetch.c": [ - "ex/HEAD/fetch.html#git_remote_fetch-8" + "ex/v1.3.0/fetch.html#git_remote_fetch-8" ] } }, "git_remote_prune": { "type": "function", "file": "git2/remote.h", - "line": 841, - "lineto": 841, + "line": 891, + "lineto": 891, "args": [ { "name": "remote", @@ -18744,8 +19246,8 @@ "git_remote_push": { "type": "function", "file": "git2/remote.h", - "line": 853, - "lineto": 855, + "line": 903, + "lineto": 905, "args": [ { "name": "remote", @@ -18774,15 +19276,15 @@ "group": "remote", "examples": { "push.c": [ - "ex/HEAD/push.html#git_remote_push-3" + "ex/v1.3.0/push.html#git_remote_push-3" ] } }, "git_remote_stats": { "type": "function", "file": "git2/remote.h", - "line": 860, - "lineto": 860, + "line": 910, + "lineto": 910, "args": [ { "name": "remote", @@ -18801,15 +19303,15 @@ "group": "remote", "examples": { "fetch.c": [ - "ex/HEAD/fetch.html#git_remote_stats-9" + "ex/v1.3.0/fetch.html#git_remote_stats-9" ] } }, "git_remote_autotag": { "type": "function", "file": "git2/remote.h", - "line": 868, - "lineto": 868, + "line": 918, + "lineto": 918, "args": [ { "name": "remote", @@ -18830,8 +19332,8 @@ "git_remote_set_autotag": { "type": "function", "file": "git2/remote.h", - "line": 880, - "lineto": 880, + "line": 931, + "lineto": 931, "args": [ { "name": "repo", @@ -18853,7 +19355,7 @@ "sig": "git_repository *::const char *::git_remote_autotag_option_t", "return": { "type": "int", - "comment": null + "comment": " 0, or an error code." }, "description": "

Set the remote's tag following setting.

\n", "comments": "

The change will be made in the configuration. No loaded remotes will be affected.

\n", @@ -18862,8 +19364,8 @@ "git_remote_prune_refs": { "type": "function", "file": "git2/remote.h", - "line": 887, - "lineto": 887, + "line": 939, + "lineto": 939, "args": [ { "name": "remote", @@ -18884,8 +19386,8 @@ "git_remote_rename": { "type": "function", "file": "git2/remote.h", - "line": 909, - "lineto": 913, + "line": 961, + "lineto": 965, "args": [ { "name": "problems", @@ -18919,15 +19421,15 @@ "group": "remote", "examples": { "remote.c": [ - "ex/HEAD/remote.html#git_remote_rename-9" + "ex/v1.3.0/remote.html#git_remote_rename-9" ] } }, "git_remote_name_is_valid": { "type": "function", "file": "git2/remote.h", - "line": 922, - "lineto": 922, + "line": 974, + "lineto": 974, "args": [ { "name": "valid", @@ -18953,8 +19455,8 @@ "git_remote_delete": { "type": "function", "file": "git2/remote.h", - "line": 934, - "lineto": 934, + "line": 986, + "lineto": 986, "args": [ { "name": "repo", @@ -18978,20 +19480,20 @@ "group": "remote", "examples": { "remote.c": [ - "ex/HEAD/remote.html#git_remote_delete-10" + "ex/v1.3.0/remote.html#git_remote_delete-10" ] } }, "git_remote_default_branch": { "type": "function", "file": "git2/remote.h", - "line": 952, - "lineto": 952, + "line": 1004, + "lineto": 1004, "args": [ { "name": "out", "type": "git_buf *", - "comment": "the buffern in which to store the reference name" + "comment": "the buffer in which to store the reference name" }, { "name": "remote", @@ -19037,7 +19539,7 @@ "group": "repository", "examples": { "general.c": [ - "ex/HEAD/general.html#git_repository_open-67" + "ex/v1.3.0/general.html#git_repository_open-67" ] } }, @@ -19170,7 +19672,7 @@ "group": "repository", "examples": { "log.c": [ - "ex/HEAD/log.html#git_repository_open_ext-43" + "ex/v1.3.0/log.html#git_repository_open_ext-43" ] } }, @@ -19224,10 +19726,10 @@ "group": "repository", "examples": { "general.c": [ - "ex/HEAD/general.html#git_repository_free-68" + "ex/v1.3.0/general.html#git_repository_free-68" ], "init.c": [ - "ex/HEAD/init.html#git_repository_free-4" + "ex/v1.3.0/init.html#git_repository_free-4" ] } }, @@ -19264,7 +19766,7 @@ "group": "repository", "examples": { "init.c": [ - "ex/HEAD/init.html#git_repository_init-5" + "ex/v1.3.0/init.html#git_repository_init-5" ] } }, @@ -19328,7 +19830,7 @@ "group": "repository", "examples": { "init.c": [ - "ex/HEAD/init.html#git_repository_init_ext-6" + "ex/v1.3.0/init.html#git_repository_init_ext-6" ] } }, @@ -19360,11 +19862,11 @@ "group": "repository", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_repository_head-31", - "ex/HEAD/merge.html#git_repository_head-32" + "ex/v1.3.0/merge.html#git_repository_head-31", + "ex/v1.3.0/merge.html#git_repository_head-32" ], "status.c": [ - "ex/HEAD/status.html#git_repository_head-3" + "ex/v1.3.0/status.html#git_repository_head-3" ] } }, @@ -19548,10 +20050,10 @@ "group": "repository", "examples": { "init.c": [ - "ex/HEAD/init.html#git_repository_path-7" + "ex/v1.3.0/init.html#git_repository_path-7" ], "status.c": [ - "ex/HEAD/status.html#git_repository_path-4" + "ex/v1.3.0/status.html#git_repository_path-4" ] } }, @@ -19578,7 +20080,7 @@ "group": "repository", "examples": { "init.c": [ - "ex/HEAD/init.html#git_repository_workdir-8" + "ex/v1.3.0/init.html#git_repository_workdir-8" ] } }, @@ -19659,7 +20161,7 @@ "group": "repository", "examples": { "status.c": [ - "ex/HEAD/status.html#git_repository_is_bare-5" + "ex/v1.3.0/status.html#git_repository_is_bare-5" ] } }, @@ -19710,7 +20212,12 @@ }, "description": "

Get the configuration file for this repository.

\n", "comments": "

If a configuration file has not been set, the default config set for the repository will be returned, including global and system configurations (if they are available).

\n\n

The configuration file must be freed once it's no longer being used by the user.

\n", - "group": "repository" + "group": "repository", + "examples": { + "config.c": [ + "ex/v1.3.0/config.html#git_repository_config-9" + ] + } }, "git_repository_config_snapshot": { "type": "function", @@ -19740,8 +20247,8 @@ "group": "repository", "examples": { "general.c": [ - "ex/HEAD/general.html#git_repository_config_snapshot-69", - "ex/HEAD/general.html#git_repository_config_snapshot-70" + "ex/v1.3.0/general.html#git_repository_config_snapshot-69", + "ex/v1.3.0/general.html#git_repository_config_snapshot-70" ] } }, @@ -19773,10 +20280,10 @@ "group": "repository", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_repository_odb-29" + "ex/v1.3.0/cat-file.html#git_repository_odb-29" ], "general.c": [ - "ex/HEAD/general.html#git_repository_odb-71" + "ex/v1.3.0/general.html#git_repository_odb-71" ] } }, @@ -19835,22 +20342,22 @@ "group": "repository", "examples": { "add.c": [ - "ex/HEAD/add.html#git_repository_index-5" + "ex/v1.3.0/add.html#git_repository_index-5" ], "commit.c": [ - "ex/HEAD/commit.html#git_repository_index-6" + "ex/v1.3.0/commit.html#git_repository_index-6" ], "general.c": [ - "ex/HEAD/general.html#git_repository_index-72" + "ex/v1.3.0/general.html#git_repository_index-72" ], "init.c": [ - "ex/HEAD/init.html#git_repository_index-9" + "ex/v1.3.0/init.html#git_repository_index-9" ], "ls-files.c": [ - "ex/HEAD/ls-files.html#git_repository_index-5" + "ex/v1.3.0/ls-files.html#git_repository_index-5" ], "merge.c": [ - "ex/HEAD/merge.html#git_repository_index-33" + "ex/v1.3.0/merge.html#git_repository_index-33" ] } }, @@ -19926,7 +20433,7 @@ "group": "repository", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_repository_state_cleanup-34" + "ex/v1.3.0/merge.html#git_repository_state_cleanup-34" ] } }, @@ -19997,8 +20504,8 @@ "git_repository_hashfile": { "type": "function", "file": "git2/repository.h", - "line": 774, - "lineto": 779, + "line": 776, + "lineto": 781, "args": [ { "name": "out", @@ -20013,7 +20520,7 @@ { "name": "path", "type": "const char *", - "comment": "Path to file on disk whose contents should be hashed. If the\n repository is not NULL, this can be a relative path." + "comment": "Path to file on disk whose contents should be hashed. This\n may be an absolute path or a relative path, in which case it\n will be treated as a path within the working directory." }, { "name": "type", @@ -20023,7 +20530,7 @@ { "name": "as_path", "type": "const char *", - "comment": "The path to use to look up filtering rules. If this is\n NULL, then the `path` parameter will be used instead. If\n this is passed as the empty string, then no filters will be\n applied when calculating the hash." + "comment": "The path to use to look up filtering rules. If this is\n an empty string then no filters will be applied when\n calculating the hash. If this is `NULL` and the `path`\n parameter is a file within the repository's working\n directory, then the `path` will be used." } ], "argline": "git_oid *out, git_repository *repo, const char *path, git_object_t type, const char *as_path", @@ -20039,8 +20546,8 @@ "git_repository_set_head": { "type": "function", "file": "git2/repository.h", - "line": 799, - "lineto": 801, + "line": 801, + "lineto": 803, "args": [ { "name": "repo", @@ -20064,15 +20571,15 @@ "group": "repository", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_repository_set_head-23" + "ex/v1.3.0/checkout.html#git_repository_set_head-23" ] } }, "git_repository_set_head_detached": { "type": "function", "file": "git2/repository.h", - "line": 819, - "lineto": 821, + "line": 821, + "lineto": 823, "args": [ { "name": "repo", @@ -20098,8 +20605,8 @@ "git_repository_set_head_detached_from_annotated": { "type": "function", "file": "git2/repository.h", - "line": 835, - "lineto": 837, + "line": 837, + "lineto": 839, "args": [ { "name": "repo", @@ -20123,15 +20630,15 @@ "group": "repository", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_repository_set_head_detached_from_annotated-24" + "ex/v1.3.0/checkout.html#git_repository_set_head_detached_from_annotated-24" ] } }, "git_repository_detach_head": { "type": "function", "file": "git2/repository.h", - "line": 856, - "lineto": 857, + "line": 858, + "lineto": 859, "args": [ { "name": "repo", @@ -20152,8 +20659,8 @@ "git_repository_state": { "type": "function", "file": "git2/repository.h", - "line": 887, - "lineto": 887, + "line": 889, + "lineto": 889, "args": [ { "name": "repo", @@ -20172,18 +20679,18 @@ "group": "repository", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_repository_state-25" + "ex/v1.3.0/checkout.html#git_repository_state-25" ], "merge.c": [ - "ex/HEAD/merge.html#git_repository_state-35" + "ex/v1.3.0/merge.html#git_repository_state-35" ] } }, "git_repository_set_namespace": { "type": "function", "file": "git2/repository.h", - "line": 901, - "lineto": 901, + "line": 903, + "lineto": 903, "args": [ { "name": "repo", @@ -20209,8 +20716,8 @@ "git_repository_get_namespace": { "type": "function", "file": "git2/repository.h", - "line": 909, - "lineto": 909, + "line": 911, + "lineto": 911, "args": [ { "name": "repo", @@ -20231,8 +20738,8 @@ "git_repository_is_shallow": { "type": "function", "file": "git2/repository.h", - "line": 918, - "lineto": 918, + "line": 920, + "lineto": 920, "args": [ { "name": "repo", @@ -20253,8 +20760,8 @@ "git_repository_ident": { "type": "function", "file": "git2/repository.h", - "line": 930, - "lineto": 930, + "line": 932, + "lineto": 932, "args": [ { "name": "name", @@ -20285,8 +20792,8 @@ "git_repository_set_ident": { "type": "function", "file": "git2/repository.h", - "line": 943, - "lineto": 943, + "line": 945, + "lineto": 945, "args": [ { "name": "repo", @@ -20559,22 +21066,22 @@ "group": "revparse", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_revparse_single-22" + "ex/v1.3.0/blame.html#git_revparse_single-22" ], "cat-file.c": [ - "ex/HEAD/cat-file.html#git_revparse_single-30" + "ex/v1.3.0/cat-file.html#git_revparse_single-30" ], "describe.c": [ - "ex/HEAD/describe.html#git_revparse_single-6" + "ex/v1.3.0/describe.html#git_revparse_single-6" ], "log.c": [ - "ex/HEAD/log.html#git_revparse_single-44" + "ex/v1.3.0/log.html#git_revparse_single-44" ], "tag.c": [ - "ex/HEAD/tag.html#git_revparse_single-9", - "ex/HEAD/tag.html#git_revparse_single-10", - "ex/HEAD/tag.html#git_revparse_single-11", - "ex/HEAD/tag.html#git_revparse_single-12" + "ex/v1.3.0/tag.html#git_revparse_single-9", + "ex/v1.3.0/tag.html#git_revparse_single-10", + "ex/v1.3.0/tag.html#git_revparse_single-11", + "ex/v1.3.0/tag.html#git_revparse_single-12" ] } }, @@ -20616,7 +21123,7 @@ "group": "revparse", "examples": { "commit.c": [ - "ex/HEAD/commit.html#git_revparse_ext-7" + "ex/v1.3.0/commit.html#git_revparse_ext-7" ] } }, @@ -20653,14 +21160,14 @@ "group": "revparse", "examples": { "blame.c": [ - "ex/HEAD/blame.html#git_revparse-23" + "ex/v1.3.0/blame.html#git_revparse-23" ], "log.c": [ - "ex/HEAD/log.html#git_revparse-45" + "ex/v1.3.0/log.html#git_revparse-45" ], "rev-parse.c": [ - "ex/HEAD/rev-parse.html#git_revparse-14", - "ex/HEAD/rev-parse.html#git_revparse-15" + "ex/v1.3.0/rev-parse.html#git_revparse-14", + "ex/v1.3.0/rev-parse.html#git_revparse-15" ] } }, @@ -20692,11 +21199,11 @@ "group": "revwalk", "examples": { "general.c": [ - "ex/HEAD/general.html#git_revwalk_new-73" + "ex/v1.3.0/general.html#git_revwalk_new-73" ], "log.c": [ - "ex/HEAD/log.html#git_revwalk_new-46", - "ex/HEAD/log.html#git_revwalk_new-47" + "ex/v1.3.0/log.html#git_revwalk_new-46", + "ex/v1.3.0/log.html#git_revwalk_new-47" ] } }, @@ -20750,10 +21257,10 @@ "group": "revwalk", "examples": { "general.c": [ - "ex/HEAD/general.html#git_revwalk_push-74" + "ex/v1.3.0/general.html#git_revwalk_push-74" ], "log.c": [ - "ex/HEAD/log.html#git_revwalk_push-48" + "ex/v1.3.0/log.html#git_revwalk_push-48" ] } }, @@ -20807,7 +21314,7 @@ "group": "revwalk", "examples": { "log.c": [ - "ex/HEAD/log.html#git_revwalk_push_head-49" + "ex/v1.3.0/log.html#git_revwalk_push_head-49" ] } }, @@ -20839,7 +21346,7 @@ "group": "revwalk", "examples": { "log.c": [ - "ex/HEAD/log.html#git_revwalk_hide-50" + "ex/v1.3.0/log.html#git_revwalk_hide-50" ] } }, @@ -20974,10 +21481,10 @@ "group": "revwalk", "examples": { "general.c": [ - "ex/HEAD/general.html#git_revwalk_next-75" + "ex/v1.3.0/general.html#git_revwalk_next-75" ], "log.c": [ - "ex/HEAD/log.html#git_revwalk_next-51" + "ex/v1.3.0/log.html#git_revwalk_next-51" ] } }, @@ -21009,11 +21516,11 @@ "group": "revwalk", "examples": { "general.c": [ - "ex/HEAD/general.html#git_revwalk_sorting-76" + "ex/v1.3.0/general.html#git_revwalk_sorting-76" ], "log.c": [ - "ex/HEAD/log.html#git_revwalk_sorting-52", - "ex/HEAD/log.html#git_revwalk_sorting-53" + "ex/v1.3.0/log.html#git_revwalk_sorting-52", + "ex/v1.3.0/log.html#git_revwalk_sorting-53" ] } }, @@ -21089,10 +21596,10 @@ "group": "revwalk", "examples": { "general.c": [ - "ex/HEAD/general.html#git_revwalk_free-77" + "ex/v1.3.0/general.html#git_revwalk_free-77" ], "log.c": [ - "ex/HEAD/log.html#git_revwalk_free-54" + "ex/v1.3.0/log.html#git_revwalk_free-54" ] } }, @@ -21193,8 +21700,8 @@ "group": "signature", "examples": { "general.c": [ - "ex/HEAD/general.html#git_signature_new-78", - "ex/HEAD/general.html#git_signature_new-79" + "ex/v1.3.0/general.html#git_signature_new-78", + "ex/v1.3.0/general.html#git_signature_new-79" ] } }, @@ -21231,7 +21738,7 @@ "group": "signature", "examples": { "merge.c": [ - "ex/HEAD/merge.html#git_signature_now-36" + "ex/v1.3.0/merge.html#git_signature_now-36" ] } }, @@ -21263,13 +21770,13 @@ "group": "signature", "examples": { "commit.c": [ - "ex/HEAD/commit.html#git_signature_default-8" + "ex/v1.3.0/commit.html#git_signature_default-8" ], "init.c": [ - "ex/HEAD/init.html#git_signature_default-10" + "ex/v1.3.0/init.html#git_signature_default-10" ], "tag.c": [ - "ex/HEAD/tag.html#git_signature_default-13" + "ex/v1.3.0/tag.html#git_signature_default-13" ] } }, @@ -21350,17 +21857,17 @@ "group": "signature", "examples": { "commit.c": [ - "ex/HEAD/commit.html#git_signature_free-9" + "ex/v1.3.0/commit.html#git_signature_free-9" ], "general.c": [ - "ex/HEAD/general.html#git_signature_free-80", - "ex/HEAD/general.html#git_signature_free-81" + "ex/v1.3.0/general.html#git_signature_free-80", + "ex/v1.3.0/general.html#git_signature_free-81" ], "init.c": [ - "ex/HEAD/init.html#git_signature_free-11" + "ex/v1.3.0/init.html#git_signature_free-11" ], "tag.c": [ - "ex/HEAD/tag.html#git_signature_free-14" + "ex/v1.3.0/tag.html#git_signature_free-14" ] } }, @@ -21559,8 +22066,8 @@ "git_status_options_init": { "type": "function", "file": "git2/status.h", - "line": 212, - "lineto": 214, + "line": 268, + "lineto": 270, "args": [ { "name": "opts", @@ -21586,8 +22093,8 @@ "git_status_foreach": { "type": "function", "file": "git2/status.h", - "line": 252, - "lineto": 255, + "line": 308, + "lineto": 311, "args": [ { "name": "repo", @@ -21616,15 +22123,15 @@ "group": "status", "examples": { "status.c": [ - "ex/HEAD/status.html#git_status_foreach-6" + "ex/v1.3.0/status.html#git_status_foreach-6" ] } }, "git_status_foreach_ext": { "type": "function", "file": "git2/status.h", - "line": 276, - "lineto": 280, + "line": 332, + "lineto": 336, "args": [ { "name": "repo", @@ -21658,15 +22165,15 @@ "group": "status", "examples": { "status.c": [ - "ex/HEAD/status.html#git_status_foreach_ext-7" + "ex/v1.3.0/status.html#git_status_foreach_ext-7" ] } }, "git_status_file": { "type": "function", "file": "git2/status.h", - "line": 308, - "lineto": 311, + "line": 364, + "lineto": 367, "args": [ { "name": "status_flags", @@ -21695,15 +22202,15 @@ "group": "status", "examples": { "add.c": [ - "ex/HEAD/add.html#git_status_file-6" + "ex/v1.3.0/add.html#git_status_file-6" ] } }, "git_status_list_new": { "type": "function", "file": "git2/status.h", - "line": 326, - "lineto": 329, + "line": 382, + "lineto": 385, "args": [ { "name": "out", @@ -21732,16 +22239,16 @@ "group": "status", "examples": { "status.c": [ - "ex/HEAD/status.html#git_status_list_new-8", - "ex/HEAD/status.html#git_status_list_new-9" + "ex/v1.3.0/status.html#git_status_list_new-8", + "ex/v1.3.0/status.html#git_status_list_new-9" ] } }, "git_status_list_entrycount": { "type": "function", "file": "git2/status.h", - "line": 340, - "lineto": 341, + "line": 396, + "lineto": 397, "args": [ { "name": "statuslist", @@ -21760,16 +22267,16 @@ "group": "status", "examples": { "status.c": [ - "ex/HEAD/status.html#git_status_list_entrycount-10", - "ex/HEAD/status.html#git_status_list_entrycount-11" + "ex/v1.3.0/status.html#git_status_list_entrycount-10", + "ex/v1.3.0/status.html#git_status_list_entrycount-11" ] } }, "git_status_byindex": { "type": "function", "file": "git2/status.h", - "line": 352, - "lineto": 354, + "line": 408, + "lineto": 410, "args": [ { "name": "statuslist", @@ -21793,20 +22300,20 @@ "group": "status", "examples": { "status.c": [ - "ex/HEAD/status.html#git_status_byindex-12", - "ex/HEAD/status.html#git_status_byindex-13", - "ex/HEAD/status.html#git_status_byindex-14", - "ex/HEAD/status.html#git_status_byindex-15", - "ex/HEAD/status.html#git_status_byindex-16", - "ex/HEAD/status.html#git_status_byindex-17" + "ex/v1.3.0/status.html#git_status_byindex-12", + "ex/v1.3.0/status.html#git_status_byindex-13", + "ex/v1.3.0/status.html#git_status_byindex-14", + "ex/v1.3.0/status.html#git_status_byindex-15", + "ex/v1.3.0/status.html#git_status_byindex-16", + "ex/v1.3.0/status.html#git_status_byindex-17" ] } }, "git_status_list_free": { "type": "function", "file": "git2/status.h", - "line": 361, - "lineto": 362, + "line": 417, + "lineto": 418, "args": [ { "name": "statuslist", @@ -21825,15 +22332,15 @@ "group": "status", "examples": { "status.c": [ - "ex/HEAD/status.html#git_status_list_free-18" + "ex/v1.3.0/status.html#git_status_list_free-18" ] } }, "git_status_should_ignore": { "type": "function", "file": "git2/status.h", - "line": 380, - "lineto": 383, + "line": 436, + "lineto": 439, "args": [ { "name": "ignored", @@ -21884,17 +22391,17 @@ "group": "strarray", "examples": { "checkout.c": [ - "ex/HEAD/checkout.html#git_strarray_dispose-26" + "ex/v1.3.0/checkout.html#git_strarray_dispose-26" ], "general.c": [ - "ex/HEAD/general.html#git_strarray_dispose-82" + "ex/v1.3.0/general.html#git_strarray_dispose-82" ], "remote.c": [ - "ex/HEAD/remote.html#git_strarray_dispose-11", - "ex/HEAD/remote.html#git_strarray_dispose-12" + "ex/v1.3.0/remote.html#git_strarray_dispose-11", + "ex/v1.3.0/remote.html#git_strarray_dispose-12" ], "tag.c": [ - "ex/HEAD/tag.html#git_strarray_dispose-15" + "ex/v1.3.0/tag.html#git_strarray_dispose-15" ] } }, @@ -21989,11 +22496,38 @@ "comments": "

Given either the submodule name or path (they are usually the same), this returns a structure describing the submodule.

\n\n

There are two expected error scenarios:

\n\n\n\n

You must call git_submodule_free when done with the submodule.

\n", "group": "submodule" }, + "git_submodule_dup": { + "type": "function", + "file": "git2/submodule.h", + "line": 233, + "lineto": 233, + "args": [ + { + "name": "out", + "type": "git_submodule **", + "comment": "Pointer to store the copy of the submodule." + }, + { + "name": "source", + "type": "git_submodule *", + "comment": "Original submodule to copy." + } + ], + "argline": "git_submodule **out, git_submodule *source", + "sig": "git_submodule **::git_submodule *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create an in-memory copy of a submodule. The copy must be explicitly\n free'd or it will leak.

\n", + "comments": "", + "group": "submodule" + }, "git_submodule_free": { "type": "function", "file": "git2/submodule.h", - "line": 231, - "lineto": 231, + "line": 240, + "lineto": 240, "args": [ { "name": "submodule", @@ -22014,8 +22548,8 @@ "git_submodule_foreach": { "type": "function", "file": "git2/submodule.h", - "line": 251, - "lineto": 254, + "line": 260, + "lineto": 263, "args": [ { "name": "repo", @@ -22044,15 +22578,15 @@ "group": "submodule", "examples": { "status.c": [ - "ex/HEAD/status.html#git_submodule_foreach-19" + "ex/v1.3.0/status.html#git_submodule_foreach-19" ] } }, "git_submodule_add_setup": { "type": "function", "file": "git2/submodule.h", - "line": 282, - "lineto": 287, + "line": 291, + "lineto": 296, "args": [ { "name": "out", @@ -22093,8 +22627,8 @@ "git_submodule_clone": { "type": "function", "file": "git2/submodule.h", - "line": 300, - "lineto": 303, + "line": 309, + "lineto": 312, "args": [ { "name": "out", @@ -22125,8 +22659,8 @@ "git_submodule_add_finalize": { "type": "function", "file": "git2/submodule.h", - "line": 315, - "lineto": 315, + "line": 324, + "lineto": 324, "args": [ { "name": "submodule", @@ -22147,8 +22681,8 @@ "git_submodule_add_to_index": { "type": "function", "file": "git2/submodule.h", - "line": 327, - "lineto": 329, + "line": 336, + "lineto": 338, "args": [ { "name": "submodule", @@ -22174,8 +22708,8 @@ "git_submodule_owner": { "type": "function", "file": "git2/submodule.h", - "line": 342, - "lineto": 342, + "line": 351, + "lineto": 351, "args": [ { "name": "submodule", @@ -22196,8 +22730,8 @@ "git_submodule_name": { "type": "function", "file": "git2/submodule.h", - "line": 350, - "lineto": 350, + "line": 359, + "lineto": 359, "args": [ { "name": "submodule", @@ -22216,15 +22750,15 @@ "group": "submodule", "examples": { "status.c": [ - "ex/HEAD/status.html#git_submodule_name-20" + "ex/v1.3.0/status.html#git_submodule_name-20" ] } }, "git_submodule_path": { "type": "function", "file": "git2/submodule.h", - "line": 361, - "lineto": 361, + "line": 370, + "lineto": 370, "args": [ { "name": "submodule", @@ -22243,15 +22777,15 @@ "group": "submodule", "examples": { "status.c": [ - "ex/HEAD/status.html#git_submodule_path-21" + "ex/v1.3.0/status.html#git_submodule_path-21" ] } }, "git_submodule_url": { "type": "function", "file": "git2/submodule.h", - "line": 369, - "lineto": 369, + "line": 378, + "lineto": 378, "args": [ { "name": "submodule", @@ -22272,8 +22806,8 @@ "git_submodule_resolve_url": { "type": "function", "file": "git2/submodule.h", - "line": 379, - "lineto": 379, + "line": 388, + "lineto": 388, "args": [ { "name": "out", @@ -22304,8 +22838,8 @@ "git_submodule_branch": { "type": "function", "file": "git2/submodule.h", - "line": 387, - "lineto": 387, + "line": 396, + "lineto": 396, "args": [ { "name": "submodule", @@ -22326,8 +22860,8 @@ "git_submodule_set_branch": { "type": "function", "file": "git2/submodule.h", - "line": 400, - "lineto": 400, + "line": 409, + "lineto": 409, "args": [ { "name": "repo", @@ -22358,8 +22892,8 @@ "git_submodule_set_url": { "type": "function", "file": "git2/submodule.h", - "line": 414, - "lineto": 414, + "line": 423, + "lineto": 423, "args": [ { "name": "repo", @@ -22390,8 +22924,8 @@ "git_submodule_index_id": { "type": "function", "file": "git2/submodule.h", - "line": 422, - "lineto": 422, + "line": 431, + "lineto": 431, "args": [ { "name": "submodule", @@ -22412,8 +22946,8 @@ "git_submodule_head_id": { "type": "function", "file": "git2/submodule.h", - "line": 430, - "lineto": 430, + "line": 439, + "lineto": 439, "args": [ { "name": "submodule", @@ -22434,8 +22968,8 @@ "git_submodule_wd_id": { "type": "function", "file": "git2/submodule.h", - "line": 443, - "lineto": 443, + "line": 452, + "lineto": 452, "args": [ { "name": "submodule", @@ -22456,8 +22990,8 @@ "git_submodule_ignore": { "type": "function", "file": "git2/submodule.h", - "line": 468, - "lineto": 469, + "line": 477, + "lineto": 478, "args": [ { "name": "submodule", @@ -22478,8 +23012,8 @@ "git_submodule_set_ignore": { "type": "function", "file": "git2/submodule.h", - "line": 481, - "lineto": 484, + "line": 490, + "lineto": 493, "args": [ { "name": "repo", @@ -22510,8 +23044,8 @@ "git_submodule_update_strategy": { "type": "function", "file": "git2/submodule.h", - "line": 496, - "lineto": 497, + "line": 505, + "lineto": 506, "args": [ { "name": "submodule", @@ -22532,8 +23066,8 @@ "git_submodule_set_update": { "type": "function", "file": "git2/submodule.h", - "line": 509, - "lineto": 512, + "line": 518, + "lineto": 521, "args": [ { "name": "repo", @@ -22564,8 +23098,8 @@ "git_submodule_fetch_recurse_submodules": { "type": "function", "file": "git2/submodule.h", - "line": 525, - "lineto": 526, + "line": 534, + "lineto": 535, "args": [ { "name": "submodule", @@ -22586,8 +23120,8 @@ "git_submodule_set_fetch_recurse_submodules": { "type": "function", "file": "git2/submodule.h", - "line": 538, - "lineto": 541, + "line": 547, + "lineto": 550, "args": [ { "name": "repo", @@ -22618,8 +23152,8 @@ "git_submodule_init": { "type": "function", "file": "git2/submodule.h", - "line": 556, - "lineto": 556, + "line": 565, + "lineto": 565, "args": [ { "name": "submodule", @@ -22645,8 +23179,8 @@ "git_submodule_repo_init": { "type": "function", "file": "git2/submodule.h", - "line": 571, - "lineto": 574, + "line": 580, + "lineto": 583, "args": [ { "name": "out", @@ -22677,8 +23211,8 @@ "git_submodule_sync": { "type": "function", "file": "git2/submodule.h", - "line": 584, - "lineto": 584, + "line": 593, + "lineto": 593, "args": [ { "name": "submodule", @@ -22699,8 +23233,8 @@ "git_submodule_open": { "type": "function", "file": "git2/submodule.h", - "line": 598, - "lineto": 600, + "line": 607, + "lineto": 609, "args": [ { "name": "repo", @@ -22726,8 +23260,8 @@ "git_submodule_reload": { "type": "function", "file": "git2/submodule.h", - "line": 612, - "lineto": 612, + "line": 621, + "lineto": 621, "args": [ { "name": "submodule", @@ -22753,8 +23287,8 @@ "git_submodule_status": { "type": "function", "file": "git2/submodule.h", - "line": 628, - "lineto": 632, + "line": 637, + "lineto": 641, "args": [ { "name": "status", @@ -22788,15 +23322,15 @@ "group": "submodule", "examples": { "status.c": [ - "ex/HEAD/status.html#git_submodule_status-22" + "ex/v1.3.0/status.html#git_submodule_status-22" ] } }, "git_submodule_location": { "type": "function", "file": "git2/submodule.h", - "line": 648, - "lineto": 650, + "line": 657, + "lineto": 659, "args": [ { "name": "location_status", @@ -22852,7 +23386,7 @@ "group": "tag", "examples": { "general.c": [ - "ex/HEAD/general.html#git_tag_lookup-83" + "ex/v1.3.0/general.html#git_tag_lookup-83" ] } }, @@ -22916,7 +23450,7 @@ "group": "tag", "examples": { "general.c": [ - "ex/HEAD/general.html#git_tag_free-84" + "ex/v1.3.0/general.html#git_tag_free-84" ] } }, @@ -22992,7 +23526,7 @@ "group": "tag", "examples": { "general.c": [ - "ex/HEAD/general.html#git_tag_target-85" + "ex/v1.3.0/general.html#git_tag_target-85" ] } }, @@ -23019,7 +23553,7 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tag_target_id-31" + "ex/v1.3.0/cat-file.html#git_tag_target_id-31" ] } }, @@ -23046,10 +23580,10 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tag_target_type-32" + "ex/v1.3.0/cat-file.html#git_tag_target_type-32" ], "general.c": [ - "ex/HEAD/general.html#git_tag_target_type-86" + "ex/v1.3.0/general.html#git_tag_target_type-86" ] } }, @@ -23076,13 +23610,13 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tag_name-33" + "ex/v1.3.0/cat-file.html#git_tag_name-33" ], "general.c": [ - "ex/HEAD/general.html#git_tag_name-87" + "ex/v1.3.0/general.html#git_tag_name-87" ], "tag.c": [ - "ex/HEAD/tag.html#git_tag_name-16" + "ex/v1.3.0/tag.html#git_tag_name-16" ] } }, @@ -23109,7 +23643,7 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tag_tagger-34" + "ex/v1.3.0/cat-file.html#git_tag_tagger-34" ] } }, @@ -23136,14 +23670,14 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tag_message-35", - "ex/HEAD/cat-file.html#git_tag_message-36" + "ex/v1.3.0/cat-file.html#git_tag_message-35", + "ex/v1.3.0/cat-file.html#git_tag_message-36" ], "general.c": [ - "ex/HEAD/general.html#git_tag_message-88" + "ex/v1.3.0/general.html#git_tag_message-88" ], "tag.c": [ - "ex/HEAD/tag.html#git_tag_message-17" + "ex/v1.3.0/tag.html#git_tag_message-17" ] } }, @@ -23200,7 +23734,7 @@ "group": "tag", "examples": { "tag.c": [ - "ex/HEAD/tag.html#git_tag_create-18" + "ex/v1.3.0/tag.html#git_tag_create-18" ] } }, @@ -23331,7 +23865,7 @@ "group": "tag", "examples": { "tag.c": [ - "ex/HEAD/tag.html#git_tag_create_lightweight-19" + "ex/v1.3.0/tag.html#git_tag_create_lightweight-19" ] } }, @@ -23363,7 +23897,7 @@ "group": "tag", "examples": { "tag.c": [ - "ex/HEAD/tag.html#git_tag_delete-20" + "ex/v1.3.0/tag.html#git_tag_delete-20" ] } }, @@ -23427,7 +23961,7 @@ "group": "tag", "examples": { "tag.c": [ - "ex/HEAD/tag.html#git_tag_list_match-21" + "ex/v1.3.0/tag.html#git_tag_list_match-21" ] } }, @@ -23845,17 +24379,17 @@ "group": "tree", "examples": { "commit.c": [ - "ex/HEAD/commit.html#git_tree_lookup-10" + "ex/v1.3.0/commit.html#git_tree_lookup-10" ], "general.c": [ - "ex/HEAD/general.html#git_tree_lookup-89", - "ex/HEAD/general.html#git_tree_lookup-90" + "ex/v1.3.0/general.html#git_tree_lookup-89", + "ex/v1.3.0/general.html#git_tree_lookup-90" ], "init.c": [ - "ex/HEAD/init.html#git_tree_lookup-12" + "ex/v1.3.0/init.html#git_tree_lookup-12" ], "merge.c": [ - "ex/HEAD/merge.html#git_tree_lookup-37" + "ex/v1.3.0/merge.html#git_tree_lookup-37" ] } }, @@ -23919,25 +24453,25 @@ "group": "tree", "examples": { "commit.c": [ - "ex/HEAD/commit.html#git_tree_free-11" + "ex/v1.3.0/commit.html#git_tree_free-11" ], "diff.c": [ - "ex/HEAD/diff.html#git_tree_free-18", - "ex/HEAD/diff.html#git_tree_free-19" + "ex/v1.3.0/diff.html#git_tree_free-18", + "ex/v1.3.0/diff.html#git_tree_free-19" ], "general.c": [ - "ex/HEAD/general.html#git_tree_free-91", - "ex/HEAD/general.html#git_tree_free-92" + "ex/v1.3.0/general.html#git_tree_free-91", + "ex/v1.3.0/general.html#git_tree_free-92" ], "init.c": [ - "ex/HEAD/init.html#git_tree_free-13" + "ex/v1.3.0/init.html#git_tree_free-13" ], "log.c": [ - "ex/HEAD/log.html#git_tree_free-55", - "ex/HEAD/log.html#git_tree_free-56", - "ex/HEAD/log.html#git_tree_free-57", - "ex/HEAD/log.html#git_tree_free-58", - "ex/HEAD/log.html#git_tree_free-59" + "ex/v1.3.0/log.html#git_tree_free-55", + "ex/v1.3.0/log.html#git_tree_free-56", + "ex/v1.3.0/log.html#git_tree_free-57", + "ex/v1.3.0/log.html#git_tree_free-58", + "ex/v1.3.0/log.html#git_tree_free-59" ] } }, @@ -24008,10 +24542,10 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tree_entrycount-37" + "ex/v1.3.0/cat-file.html#git_tree_entrycount-37" ], "general.c": [ - "ex/HEAD/general.html#git_tree_entrycount-93" + "ex/v1.3.0/general.html#git_tree_entrycount-93" ] } }, @@ -24043,7 +24577,7 @@ "group": "tree", "examples": { "general.c": [ - "ex/HEAD/general.html#git_tree_entry_byname-94" + "ex/v1.3.0/general.html#git_tree_entry_byname-94" ] } }, @@ -24075,10 +24609,10 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tree_entry_byindex-38" + "ex/v1.3.0/cat-file.html#git_tree_entry_byindex-38" ], "general.c": [ - "ex/HEAD/general.html#git_tree_entry_byindex-95" + "ex/v1.3.0/general.html#git_tree_entry_byindex-95" ] } }, @@ -24213,11 +24747,11 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tree_entry_name-39" + "ex/v1.3.0/cat-file.html#git_tree_entry_name-39" ], "general.c": [ - "ex/HEAD/general.html#git_tree_entry_name-96", - "ex/HEAD/general.html#git_tree_entry_name-97" + "ex/v1.3.0/general.html#git_tree_entry_name-96", + "ex/v1.3.0/general.html#git_tree_entry_name-97" ] } }, @@ -24244,7 +24778,7 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tree_entry_id-40" + "ex/v1.3.0/cat-file.html#git_tree_entry_id-40" ] } }, @@ -24271,7 +24805,7 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tree_entry_type-41" + "ex/v1.3.0/cat-file.html#git_tree_entry_type-41" ] } }, @@ -24298,7 +24832,7 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/HEAD/cat-file.html#git_tree_entry_filemode-42" + "ex/v1.3.0/cat-file.html#git_tree_entry_filemode-42" ] } }, @@ -24384,7 +24918,7 @@ "group": "tree", "examples": { "general.c": [ - "ex/HEAD/general.html#git_tree_entry_to_object-98" + "ex/v1.3.0/general.html#git_tree_entry_to_object-98" ] } }, @@ -24558,8 +25092,8 @@ "git_treebuilder_remove": { "type": "function", "file": "git2/tree.h", - "line": 338, - "lineto": 339, + "line": 339, + "lineto": 340, "args": [ { "name": "bld", @@ -24576,7 +25110,7 @@ "sig": "git_treebuilder *::const char *", "return": { "type": "int", - "comment": null + "comment": " 0 or an error code" }, "description": "

Remove an entry from the builder by its filename

\n", "comments": "", @@ -24585,8 +25119,8 @@ "git_treebuilder_filter": { "type": "function", "file": "git2/tree.h", - "line": 363, - "lineto": 366, + "line": 364, + "lineto": 367, "args": [ { "name": "bld", @@ -24617,8 +25151,8 @@ "git_treebuilder_write": { "type": "function", "file": "git2/tree.h", - "line": 378, - "lineto": 379, + "line": 379, + "lineto": 380, "args": [ { "name": "id", @@ -24644,8 +25178,8 @@ "git_tree_walk": { "type": "function", "file": "git2/tree.h", - "line": 408, - "lineto": 412, + "line": 409, + "lineto": 413, "args": [ { "name": "tree", @@ -24681,8 +25215,8 @@ "git_tree_dup": { "type": "function", "file": "git2/tree.h", - "line": 421, - "lineto": 421, + "line": 422, + "lineto": 422, "args": [ { "name": "out", @@ -24708,8 +25242,8 @@ "git_tree_create_updated": { "type": "function", "file": "git2/tree.h", - "line": 467, - "lineto": 467, + "line": 469, + "lineto": 469, "args": [ { "name": "out", @@ -24741,7 +25275,7 @@ "sig": "git_oid *::git_repository *::git_tree *::size_t::const git_tree_update *", "return": { "type": "int", - "comment": null + "comment": " 0 or an error code" }, "description": "

Create a tree based on another one with the specified modifications

\n", "comments": "

Given the baseline perform the changes described in the list of updates and create a new tree.

\n\n

This function is optimized for common file/directory addition, removal and replacement in trees. It is much more efficient than reading the tree into a git_index and modifying that, but in exchange it is not as flexible.

\n\n

Deleting and adding the same entry is undefined behaviour, changing a tree to a blob or viceversa is not supported.

\n", @@ -25069,8 +25603,8 @@ "git_worktree_prune_options_init": { "type": "function", "file": "git2/worktree.h", - "line": 217, - "lineto": 219, + "line": 218, + "lineto": 220, "args": [ { "name": "opts", @@ -25096,8 +25630,8 @@ "git_worktree_is_prunable": { "type": "function", "file": "git2/worktree.h", - "line": 235, - "lineto": 236, + "line": 236, + "lineto": 237, "args": [ { "name": "wt", @@ -25123,8 +25657,8 @@ "git_worktree_prune": { "type": "function", "file": "git2/worktree.h", - "line": 250, - "lineto": 251, + "line": 251, + "lineto": 252, "args": [ { "name": "wt", @@ -25204,8 +25738,8 @@ "git_attr_foreach_cb": { "type": "callback", "file": "git2/attr.h", - "line": 212, - "lineto": 212, + "line": 287, + "lineto": 287, "args": [ { "name": "name", @@ -25235,12 +25769,12 @@ "git_transport_certificate_check_cb": { "type": "callback", "file": "git2/cert.h", - "line": 71, - "lineto": 71, + "line": 72, + "lineto": 72, "args": [ { "name": "cert", - "type": "struct git_cert *", + "type": "git_cert *", "comment": "The host certificate" }, { @@ -25259,8 +25793,8 @@ "comment": "Payload provided by the caller" } ], - "argline": "struct git_cert *cert, int valid, const char *host, void *payload", - "sig": "struct git_cert *::int::const char *::void *", + "argline": "git_cert *cert, int valid, const char *host, void *payload", + "sig": "git_cert *::int::const char *::void *", "return": { "type": "int", "comment": " 0 to proceed with the connection, \n<\n 0 to fail the connection\n or > 0 to indicate that the callback refused to act and that\n the existing validity determination should be honored" @@ -25271,8 +25805,8 @@ "git_checkout_notify_cb": { "type": "callback", "file": "git2/checkout.h", - "line": 236, - "lineto": 242, + "line": 252, + "lineto": 258, "args": [ { "name": "why", @@ -25317,8 +25851,8 @@ "git_checkout_progress_cb": { "type": "callback", "file": "git2/checkout.h", - "line": 245, - "lineto": 249, + "line": 261, + "lineto": 265, "args": [ { "name": "path", @@ -25353,8 +25887,8 @@ "git_checkout_perfdata_cb": { "type": "callback", "file": "git2/checkout.h", - "line": 252, - "lineto": 254, + "line": 268, + "lineto": 270, "args": [ { "name": "perfdata", @@ -25453,41 +25987,66 @@ "description": "

The signature of a function matchin git_repository_init, with an\n aditional void * as callback payload.

\n", "comments": "

Callers of git_clone my provide a function matching this signature to override the repository creation and customization process during a clone operation.

\n" }, - "git_commit_signing_cb": { + "git_commit_create_cb": { "type": "callback", "file": "git2/commit.h", - "line": 523, - "lineto": 524, + "line": 531, + "lineto": 540, "args": [ { - "name": "signature", - "type": "git_buf *", - "comment": null + "name": "out", + "type": "git_oid *", + "comment": "pointer that this callback will populate with the object\n id of the commit that is created" }, { - "name": "signature_field", - "type": "git_buf *", - "comment": null + "name": "author", + "type": "const git_signature *", + "comment": "the author name and time of the commit" }, { - "name": "commit_content", + "name": "committer", + "type": "const git_signature *", + "comment": "the committer name and time of the commit" + }, + { + "name": "message_encoding", "type": "const char *", - "comment": null + "comment": "the encoding of the given message, or NULL\n to assume UTF8" + }, + { + "name": "message", + "type": "const char *", + "comment": "the commit message" + }, + { + "name": "tree", + "type": "const git_tree *", + "comment": "the tree to be committed" + }, + { + "name": "parent_count", + "type": "size_t", + "comment": "the number of parents for this commit" + }, + { + "name": "parents", + "type": "const git_commit *[]", + "comment": "the commit parents" }, { "name": "payload", "type": "void *", - "comment": null + "comment": "the payload pointer in the rebase options" } ], - "argline": "git_buf *signature, git_buf *signature_field, const char *commit_content, void *payload", - "sig": "git_buf *::git_buf *::const char *::void *", + "argline": "git_oid *out, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_tree *tree, size_t parent_count, const git_commit *[] parents, void *payload", + "sig": "git_oid *::const git_signature *::const git_signature *::const char *::const char *::const git_tree *::size_t::const git_commit *[]::void *", "return": { "type": "int", - "comment": null + "comment": " 0 if this callback has created the commit and populated the out\n parameter, GIT_PASSTHROUGH if the callback has not created a\n commit and wants the calling function to create the commit as\n if no callback had been specified, any other value to stop\n and return a failure" }, - "description": "

Commit signing callback.

\n", - "comments": "

The callback will be called with the commit content, giving a user an opportunity to sign the commit content. The signature_field buf may be left empty to specify the default field "gpgsig".

\n\n

Signatures can take the form of any string, and can be created on an arbitrary header field. Signatures are most commonly used for verifying authorship of a commit using GPG or a similar cryptographically secure signing algorithm. See https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work for more details.

\n\n

When the callback: - returns GIT_PASSTHROUGH, no signature will be added to the commit. - returns < 0, commit creation will be aborted. - returns GIT_OK, the signature parameter is expected to be filled.

\n" + "description": "

Commit creation callback: used when a function is going to create\n commits (for example, in git_rebase_commit) to allow callers to\n override the commit creation behavior. For example, users may\n wish to sign commits by providing this information to\n git_commit_create_buffer, signing that buffer, then calling\n git_commit_create_with_signature. The resultant commit id\n should be set in the out object id parameter.

\n", + "comments": "" }, "git_config_foreach_cb": { "type": "callback", @@ -25556,11 +26115,47 @@ "description": "

Credential acquisition callback.

\n", "comments": "

This callback is usually involved any time another system might need authentication. As such, you are expected to provide a valid git_credential object back, depending on allowed_types (a git_credential_t bitmask).

\n\n

Note that most authentication details are your responsibility - this callback will be called until the authentication succeeds, or you report an error. As such, it's easy to get in a loop if you fail to stop providing the same incorrect credentials.

\n" }, + "git_commit_signing_cb": { + "type": "callback", + "file": "git2/deprecated.h", + "line": 276, + "lineto": 280, + "args": [ + { + "name": "signature", + "type": "git_buf *", + "comment": null + }, + { + "name": "signature_field", + "type": "git_buf *", + "comment": null + }, + { + "name": "commit_content", + "type": "const char *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_buf *signature, git_buf *signature_field, const char *commit_content, void *payload", + "sig": "git_buf *::git_buf *::const char *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Provide a commit signature during commit creation.

\n", + "comments": "

Callers should instead define a git_commit_create_cb that generates a commit buffer using git_commit_create_buffer, sign that buffer and call git_commit_create_with_signature.

\n" + }, "git_headlist_cb": { "type": "callback", "file": "git2/deprecated.h", - "line": 617, - "lineto": 617, + "line": 847, + "lineto": 847, "args": [ { "name": "rhead", @@ -25585,8 +26180,8 @@ "git_diff_notify_cb": { "type": "callback", "file": "git2/diff.h", - "line": 331, - "lineto": 335, + "line": 345, + "lineto": 349, "args": [ { "name": "diff_so_far", @@ -25621,8 +26216,8 @@ "git_diff_progress_cb": { "type": "callback", "file": "git2/diff.h", - "line": 347, - "lineto": 351, + "line": 361, + "lineto": 365, "args": [ { "name": "diff_so_far", @@ -25657,8 +26252,8 @@ "git_diff_file_cb": { "type": "callback", "file": "git2/diff.h", - "line": 465, - "lineto": 468, + "line": 479, + "lineto": 482, "args": [ { "name": "delta", @@ -25688,8 +26283,8 @@ "git_diff_binary_cb": { "type": "callback", "file": "git2/diff.h", - "line": 531, - "lineto": 534, + "line": 545, + "lineto": 548, "args": [ { "name": "delta", @@ -25719,8 +26314,8 @@ "git_diff_hunk_cb": { "type": "callback", "file": "git2/diff.h", - "line": 557, - "lineto": 560, + "line": 571, + "lineto": 574, "args": [ { "name": "delta", @@ -25750,8 +26345,8 @@ "git_diff_line_cb": { "type": "callback", "file": "git2/diff.h", - "line": 618, - "lineto": 622, + "line": 632, + "lineto": 636, "args": [ { "name": "delta", @@ -25823,7 +26418,7 @@ { "name": "stats", "type": "const git_indexer_progress *", - "comment": "Structure containing information about the state of the tran sfer" + "comment": "Structure containing information about the state of the transfer" }, { "name": "payload", @@ -25967,8 +26562,8 @@ "git_reference_foreach_cb": { "type": "callback", "file": "git2/refs.h", - "line": 434, - "lineto": 434, + "line": 437, + "lineto": 437, "args": [ { "name": "reference", @@ -25993,8 +26588,8 @@ "git_reference_foreach_name_cb": { "type": "callback", "file": "git2/refs.h", - "line": 445, - "lineto": 445, + "line": 448, + "lineto": 448, "args": [ { "name": "name", @@ -26019,8 +26614,8 @@ "git_push_transfer_progress_cb": { "type": "callback", "file": "git2/remote.h", - "line": 427, - "lineto": 431, + "line": 450, + "lineto": 454, "args": [ { "name": "current", @@ -26055,8 +26650,8 @@ "git_push_negotiation": { "type": "callback", "file": "git2/remote.h", - "line": 463, - "lineto": 463, + "line": 486, + "lineto": 486, "args": [ { "name": "updates", @@ -26086,8 +26681,8 @@ "git_push_update_reference_cb": { "type": "callback", "file": "git2/remote.h", - "line": 477, - "lineto": 477, + "line": 500, + "lineto": 500, "args": [ { "name": "refname", @@ -26117,8 +26712,8 @@ "git_url_resolve_cb": { "type": "callback", "file": "git2/remote.h", - "line": 491, - "lineto": 491, + "line": 516, + "lineto": 516, "args": [ { "name": "url_resolved", @@ -26145,11 +26740,42 @@ "sig": "git_buf *::const char *::int::void *", "return": { "type": "int", - "comment": " 0 on success, GIT_PASSTHROUGH or an error" + "comment": " 0 on success, GIT_PASSTHROUGH or an error\n " }, "description": "

Callback to resolve URLs before connecting to remote

\n", "comments": "

If you return GIT_PASSTHROUGH, you don't need to write anything to url_resolved.

\n" }, + "git_remote_ready_cb": { + "type": "callback", + "file": "git2/remote.h", + "line": 529, + "lineto": 529, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "The remote to be connected" + }, + { + "name": "direction", + "type": "int", + "comment": "GIT_DIRECTION_FETCH or GIT_DIRECTION_PUSH" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload provided by the caller" + } + ], + "argline": "git_remote *remote, int direction, void *payload", + "sig": "git_remote *::int::void *", + "return": { + "type": "int", + "comment": " 0 on success, or an error" + }, + "description": "

Callback invoked immediately before we attempt to connect to the\n given url. Callers may change the URL before the connection by\n calling git_remote_set_instance_url in the callback.

\n", + "comments": "" + }, "git_repository_fetchhead_foreach_cb": { "type": "callback", "file": "git2/repository.h", @@ -26489,8 +27115,8 @@ "git_treebuilder_filter_cb": { "type": "callback", "file": "git2/tree.h", - "line": 348, - "lineto": 349, + "line": 349, + "lineto": 350, "args": [ { "name": "entry", @@ -26515,8 +27141,8 @@ "git_treewalk_cb": { "type": "callback", "file": "git2/tree.h", - "line": 382, - "lineto": 383, + "line": 383, + "lineto": 384, "args": [ { "name": "root", @@ -26553,8 +27179,8 @@ "type": "struct", "value": "git_annotated_commit", "file": "git2/types.h", - "line": 189, - "lineto": 189, + "line": 198, + "lineto": 198, "tdef": "typedef", "description": " Annotated commits, the input to merge and rebase. ", "comments": "", @@ -26617,8 +27243,8 @@ ], "type": "enum", "file": "git2/apply.h", - "line": 112, - "lineto": 130, + "line": 113, + "lineto": 131, "block": "GIT_APPLY_LOCATION_WORKDIR\nGIT_APPLY_LOCATION_INDEX\nGIT_APPLY_LOCATION_BOTH", "tdef": "typedef", "description": " Possible application locations for git_apply ", @@ -26706,6 +27332,56 @@ } } ], + [ + "git_attr_options", + { + "decl": [ + "unsigned int version", + "unsigned int flags", + "git_oid * commit_id", + "git_oid attr_commit_id" + ], + "type": "struct", + "value": "git_attr_options", + "file": "git2/attr.h", + "line": 144, + "lineto": 161, + "block": "unsigned int version\nunsigned int flags\ngit_oid * commit_id\ngit_oid attr_commit_id", + "tdef": "typedef", + "description": " An options structure for querying attributes.", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "unsigned int", + "name": "flags", + "comments": " A combination of GIT_ATTR_CHECK flags " + }, + { + "type": "git_oid *", + "name": "commit_id", + "comments": "" + }, + { + "type": "git_oid", + "name": "attr_commit_id", + "comments": " The commit to load attributes from, when\n `GIT_ATTR_CHECK_INCLUDE_COMMIT` is specified." + } + ], + "used": { + "returns": [], + "needs": [ + "git_attr_foreach_ext", + "git_attr_get_ext", + "git_attr_get_many_ext" + ] + } + } + ], [ "git_attr_value_t", { @@ -26764,8 +27440,8 @@ "type": "struct", "value": "git_blame", "file": "git2/blame.h", - "line": 151, - "lineto": 151, + "line": 202, + "lineto": 202, "tdef": "typedef", "description": " Opaque structure to hold blame results ", "comments": "", @@ -26803,7 +27479,7 @@ "type": "enum", "file": "git2/blame.h", "line": 26, - "lineto": 52, + "lineto": 77, "block": "GIT_BLAME_NORMAL\nGIT_BLAME_TRACK_COPIES_SAME_FILE\nGIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES\nGIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES\nGIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES\nGIT_BLAME_FIRST_PARENT\nGIT_BLAME_USE_MAILMAP\nGIT_BLAME_IGNORE_WHITESPACE", "tdef": "typedef", "description": " Flags for indicating option behavior for git_blame APIs.", @@ -26818,37 +27494,37 @@ { "type": "int", "name": "GIT_BLAME_TRACK_COPIES_SAME_FILE", - "comments": "

Track lines that have moved within a file (like git blame -M).\n NOT IMPLEMENTED.

\n", + "comments": "

Track lines that have moved within a file (like git blame -M).

\n\n

This is not yet implemented and reserved for future use.

\n", "value": 1 }, { "type": "int", "name": "GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES", - "comments": "

Track lines that have moved across files in the same commit (like git blame -C).\n NOT IMPLEMENTED.

\n", + "comments": "

Track lines that have moved across files in the same commit\n (like git blame -C).

\n\n

This is not yet implemented and reserved for future use.

\n", "value": 2 }, { "type": "int", "name": "GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES", - "comments": "

Track lines that have been copied from another file that exists in the\n same commit (like git blame -CC). Implies SAME_FILE.\n NOT IMPLEMENTED.

\n", + "comments": "

Track lines that have been copied from another file that exists\n in the same commit (like git blame -CC). Implies SAME_FILE.

\n\n

This is not yet implemented and reserved for future use.

\n", "value": 4 }, { "type": "int", "name": "GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES", - "comments": "

Track lines that have been copied from another file that exists in any\n commit (like git blame -CCC). Implies SAME_COMMIT_COPIES.\n NOT IMPLEMENTED.

\n", + "comments": "

Track lines that have been copied from another file that exists in\n any commit (like git blame -CCC). Implies SAME_COMMIT_COPIES.

\n\n

This is not yet implemented and reserved for future use.

\n", "value": 8 }, { "type": "int", "name": "GIT_BLAME_FIRST_PARENT", - "comments": "

Restrict the search of commits to those reachable following only the\n first parents.

\n", + "comments": "

Restrict the search of commits to those reachable following only\n the first parents.

\n", "value": 16 }, { "type": "int", "name": "GIT_BLAME_USE_MAILMAP", - "comments": "

Use mailmap file to map author and committer names and email addresses\n to canonical real names and email addresses. The mailmap will be read\n from the working directory, or HEAD in a bare repository.

\n", + "comments": "

Use mailmap file to map author and committer names and email\n addresses to canonical real names and email addresses. The\n mailmap will be read from the working directory, or HEAD in a\n bare repository.

\n", "value": 32 }, { @@ -26881,57 +27557,57 @@ "type": "struct", "value": "git_blame_hunk", "file": "git2/blame.h", - "line": 134, - "lineto": 147, + "line": 145, + "lineto": 198, "block": "size_t lines_in_hunk\ngit_oid final_commit_id\nsize_t final_start_line_number\ngit_signature * final_signature\ngit_oid orig_commit_id\nconst char * orig_path\nsize_t orig_start_line_number\ngit_signature * orig_signature\nchar boundary", "tdef": "typedef", "description": " Structure that represents a blame hunk.", - "comments": "\n", + "comments": "", "fields": [ { "type": "size_t", "name": "lines_in_hunk", - "comments": "" + "comments": " The number of lines in this hunk." }, { "type": "git_oid", "name": "final_commit_id", - "comments": "" + "comments": " The OID of the commit where this line was last changed." }, { "type": "size_t", "name": "final_start_line_number", - "comments": "" + "comments": " The 1-based line number where this hunk begins, in the final version\n of the file." }, { "type": "git_signature *", "name": "final_signature", - "comments": "" + "comments": " The author of `final_commit_id`. If `GIT_BLAME_USE_MAILMAP` has been\n specified, it will contain the canonical real name and email address." }, { "type": "git_oid", "name": "orig_commit_id", - "comments": "" + "comments": " The OID of the commit where this hunk was found.\n This will usually be the same as `final_commit_id`, except when\n `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified." }, { "type": "const char *", "name": "orig_path", - "comments": "" + "comments": " The path to the file where this hunk originated, as of the commit\n specified by `orig_commit_id`." }, { "type": "size_t", "name": "orig_start_line_number", - "comments": "" + "comments": " The 1-based line number where this hunk begins in the file named by\n `orig_path` in the commit specified by `orig_commit_id`." }, { "type": "git_signature *", "name": "orig_signature", - "comments": "" + "comments": " The author of `orig_commit_id`. If `GIT_BLAME_USE_MAILMAP` has been\n specified, it will contain the canonical real name and email address." }, { "type": "char", "name": "boundary", - "comments": "" + "comments": " The 1 iff the hunk has been tracked to a boundary commit (the root,\n or the commit specified in git_blame_options.oldest_commit)" } ], "used": { @@ -26958,8 +27634,8 @@ "type": "struct", "value": "git_blame_options", "file": "git2/blame.h", - "line": 61, - "lineto": 90, + "line": 86, + "lineto": 123, "block": "unsigned int version\nuint32_t flags\nuint16_t min_match_characters\ngit_oid newest_commit\ngit_oid oldest_commit\nsize_t min_line\nsize_t max_line", "tdef": "typedef", "description": " Blame options structure", @@ -26978,7 +27654,7 @@ { "type": "uint16_t", "name": "min_match_characters", - "comments": " The lower bound on the number of alphanumeric\n characters that must be detected as moving/copying within a file for it to\n associate those lines with the parent commit. The default value is 20.\n This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`\n flags are specified." + "comments": " The lower bound on the number of alphanumeric characters that\n must be detected as moving/copying within a file for it to\n associate those lines with the parent commit. The default value\n is 20.\n\n This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`\n flags are specified." }, { "type": "git_oid", @@ -27018,8 +27694,8 @@ "type": "struct", "value": "git_blob", "file": "git2/types.h", - "line": 124, - "lineto": 124, + "line": 133, + "lineto": 133, "tdef": "typedef", "description": " In-memory representation of a blob object. ", "comments": "", @@ -27042,6 +27718,7 @@ "git_diff_blobs", "git_filter_list_apply_to_blob", "git_filter_list_load", + "git_filter_list_load_ext", "git_filter_list_stream_blob", "git_patch_from_blob_and_buffer", "git_patch_from_blobs" @@ -27055,13 +27732,14 @@ "decl": [ "GIT_BLOB_FILTER_CHECK_FOR_BINARY", "GIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES", - "GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD" + "GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD", + "GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT" ], "type": "enum", "file": "git2/blob.h", "line": 102, - "lineto": 117, - "block": "GIT_BLOB_FILTER_CHECK_FOR_BINARY\nGIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES\nGIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD", + "lineto": 123, + "block": "GIT_BLOB_FILTER_CHECK_FOR_BINARY\nGIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES\nGIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD\nGIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT", "tdef": "typedef", "description": " Flags to control the functionality of `git_blob_filter`.", "comments": "", @@ -27083,6 +27761,12 @@ "name": "GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD", "comments": "

When set, filters will be loaded from a .gitattributes file\n in the HEAD commit.

\n", "value": 4 + }, + { + "type": "int", + "name": "GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT", + "comments": "

When set, filters will be loaded from a .gitattributes file\n in the specified commit.

\n", + "value": 8 } ], "used": { @@ -27096,14 +27780,16 @@ { "decl": [ "int version", - "uint32_t flags" + "uint32_t flags", + "git_oid * commit_id", + "git_oid attr_commit_id" ], "type": "struct", "value": "git_blob_filter_options", "file": "git2/blob.h", - "line": 126, - "lineto": 131, - "block": "int version\nuint32_t flags", + "line": 132, + "lineto": 149, + "block": "int version\nuint32_t flags\ngit_oid * commit_id\ngit_oid attr_commit_id", "tdef": "typedef", "description": " The options used when applying filter options to a file.", "comments": "

Initialize with GIT_BLOB_FILTER_OPTIONS_INIT. Alternatively, you can use git_blob_filter_options_init.

\n", @@ -27117,6 +27803,16 @@ "type": "uint32_t", "name": "flags", "comments": " Flags to control the filtering process, see `git_blob_filter_flag_t` above " + }, + { + "type": "git_oid *", + "name": "commit_id", + "comments": "" + }, + { + "type": "git_oid", + "name": "attr_commit_id", + "comments": " The commit to load attributes from, when\n `GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT` is specified." } ], "used": { @@ -27160,8 +27856,8 @@ ], "type": "enum", "file": "git2/types.h", - "line": 206, - "lineto": 210, + "line": 215, + "lineto": 219, "block": "GIT_BRANCH_LOCAL\nGIT_BRANCH_REMOTE\nGIT_BRANCH_ALL", "tdef": "typedef", "description": " Basic type of any Git branch. ", @@ -27236,6 +27932,7 @@ "git_blob_filter", "git_blob_filtered_content", "git_branch_remote_name", + "git_branch_upstream_merge", "git_branch_upstream_name", "git_branch_upstream_remote", "git_buf_contains_nul", @@ -27261,6 +27958,7 @@ "git_diff_stats_to_buf", "git_diff_to_buf", "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_buffer", "git_filter_list_apply_to_data", "git_filter_list_apply_to_file", "git_filter_list_stream_data", @@ -27290,8 +27988,8 @@ "type": "struct", "value": "git_cert", "file": "git2/types.h", - "line": 253, - "lineto": 253, + "line": 262, + "lineto": 262, "block": "git_cert_t cert_type", "tdef": "typedef", "description": " Parent type for `git_cert_hostkey` and `git_cert_x509`.", @@ -27315,7 +28013,7 @@ "git_cert_hostkey", { "decl": [ - "struct git_cert parent", + "git_cert parent", "git_cert_ssh_t type", "unsigned char [16] hash_md5", "unsigned char [20] hash_sha1", @@ -27327,15 +28025,15 @@ "type": "struct", "value": "git_cert_hostkey", "file": "git2/cert.h", - "line": 107, - "lineto": 150, - "block": "struct git_cert parent\ngit_cert_ssh_t type\nunsigned char [16] hash_md5\nunsigned char [20] hash_sha1\nunsigned char [32] hash_sha256\ngit_cert_ssh_raw_type_t raw_type\nconst char * hostkey\nsize_t hostkey_len", + "line": 108, + "lineto": 151, + "block": "git_cert parent\ngit_cert_ssh_t type\nunsigned char [16] hash_md5\nunsigned char [20] hash_sha1\nunsigned char [32] hash_sha256\ngit_cert_ssh_raw_type_t raw_type\nconst char * hostkey\nsize_t hostkey_len", "tdef": "typedef", "description": " Hostkey information taken from libssh2", "comments": "", "fields": [ { - "type": "struct git_cert", + "type": "git_cert", "name": "parent", "comments": " The parent cert " }, @@ -27392,8 +28090,8 @@ ], "type": "enum", "file": "git2/cert.h", - "line": 76, - "lineto": 85, + "line": 77, + "lineto": 86, "block": "GIT_CERT_SSH_MD5\nGIT_CERT_SSH_SHA1\nGIT_CERT_SSH_SHA256\nGIT_CERT_SSH_RAW", "tdef": "typedef", "description": " Type of SSH host fingerprint", @@ -27441,8 +28139,8 @@ ], "type": "enum", "file": "git2/cert.h", - "line": 24, - "lineto": 47, + "line": 25, + "lineto": 48, "block": "GIT_CERT_NONE\nGIT_CERT_X509\nGIT_CERT_HOSTKEY_LIBSSH2\nGIT_CERT_STRARRAY\nGIT_CERT_NONE\nGIT_CERT_X509\nGIT_CERT_HOSTKEY_LIBSSH2\nGIT_CERT_STRARRAY", "tdef": "typedef", "description": " Type of host certificate structure that is passed to the check callback", @@ -27483,22 +28181,22 @@ "git_cert_x509", { "decl": [ - "struct git_cert parent", + "git_cert parent", "void * data", "size_t len" ], "type": "struct", "value": "git_cert_x509", "file": "git2/cert.h", - "line": 155, - "lineto": 167, - "block": "struct git_cert parent\nvoid * data\nsize_t len", + "line": 156, + "lineto": 168, + "block": "git_cert parent\nvoid * data\nsize_t len", "tdef": "typedef", "description": " X.509 certificate information", "comments": "", "fields": [ { - "type": "struct git_cert", + "type": "git_cert", "name": "parent", "comments": " The parent cert " }, @@ -27533,12 +28231,12 @@ ], "type": "enum", "file": "git2/checkout.h", - "line": 217, - "lineto": 226, + "line": 211, + "lineto": 242, "block": "GIT_CHECKOUT_NOTIFY_NONE\nGIT_CHECKOUT_NOTIFY_CONFLICT\nGIT_CHECKOUT_NOTIFY_DIRTY\nGIT_CHECKOUT_NOTIFY_UPDATED\nGIT_CHECKOUT_NOTIFY_UNTRACKED\nGIT_CHECKOUT_NOTIFY_IGNORED\nGIT_CHECKOUT_NOTIFY_ALL", "tdef": "typedef", "description": " Checkout notification flags", - "comments": "

Checkout will invoke an options notification callback (notify_cb) for certain cases - you pick which ones via notify_flags:

\n\n\n\n

Returning a non-zero value from this callback will cancel the checkout. The non-zero return value will be propagated back and returned by the git_checkout_... call.

\n\n

Notification callbacks are made prior to modifying any files on disk, so canceling on any notification will still happen prior to any files being modified.

\n", + "comments": "

Checkout will invoke an options notification callback (notify_cb) for certain cases - you pick which ones via notify_flags:

\n\n

Returning a non-zero value from this callback will cancel the checkout. The non-zero return value will be propagated back and returned by the git_checkout_... call.

\n\n

Notification callbacks are made prior to modifying any files on disk, so canceling on any notification will still happen prior to any files being modified.

\n", "fields": [ { "type": "int", @@ -27549,37 +28247,37 @@ { "type": "int", "name": "GIT_CHECKOUT_NOTIFY_CONFLICT", - "comments": "", + "comments": "

Invokes checkout on conflicting paths.

\n", "value": 1 }, { "type": "int", "name": "GIT_CHECKOUT_NOTIFY_DIRTY", - "comments": "", + "comments": "

Notifies about "dirty" files, i.e. those that do not need an update\n but no longer match the baseline. Core git displays these files when\n checkout runs, but won't stop the checkout.

\n", "value": 2 }, { "type": "int", "name": "GIT_CHECKOUT_NOTIFY_UPDATED", - "comments": "", + "comments": "

Sends notification for any file changed.

\n", "value": 4 }, { "type": "int", "name": "GIT_CHECKOUT_NOTIFY_UNTRACKED", - "comments": "", + "comments": "

Notifies about untracked files.

\n", "value": 8 }, { "type": "int", "name": "GIT_CHECKOUT_NOTIFY_IGNORED", - "comments": "", + "comments": "

Notifies about ignored files.

\n", "value": 16 }, { "type": "int", "name": "GIT_CHECKOUT_NOTIFY_ALL", - "comments": "", + "comments": "

Notifies about ignored files.

\n", "value": 65535 } ], @@ -27619,8 +28317,8 @@ "type": "struct", "value": "git_checkout_options", "file": "git2/checkout.h", - "line": 263, - "lineto": 326, + "line": 279, + "lineto": 342, "block": "unsigned int version\nunsigned int checkout_strategy\nint disable_filters\nunsigned int dir_mode\nunsigned int file_mode\nint file_open_flags\nunsigned int notify_flags\ngit_checkout_notify_cb notify_cb\nvoid * notify_payload\ngit_checkout_progress_cb progress_cb\nvoid * progress_payload\ngit_strarray paths\ngit_tree * baseline\ngit_index * baseline_index\nconst char * target_directory\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_checkout_perfdata_cb perfdata_cb\nvoid * perfdata_payload", "tdef": "typedef", "description": " Checkout options structure", @@ -27752,8 +28450,8 @@ "type": "struct", "value": "git_checkout_perfdata", "file": "git2/checkout.h", - "line": 229, - "lineto": 233, + "line": 245, + "lineto": 249, "block": "size_t mkdir_calls\nsize_t stat_calls\nsize_t chmod_calls", "tdef": "typedef", "description": " Checkout performance-reporting structure ", @@ -27807,14 +28505,15 @@ "GIT_CHECKOUT_CONFLICT_STYLE_DIFF3", "GIT_CHECKOUT_DONT_REMOVE_EXISTING", "GIT_CHECKOUT_DONT_WRITE_INDEX", + "GIT_CHECKOUT_DRY_RUN", "GIT_CHECKOUT_UPDATE_SUBMODULES", "GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED" ], "type": "enum", "file": "git2/checkout.h", "line": 106, - "lineto": 189, - "block": "GIT_CHECKOUT_NONE\nGIT_CHECKOUT_SAFE\nGIT_CHECKOUT_FORCE\nGIT_CHECKOUT_RECREATE_MISSING\nGIT_CHECKOUT_ALLOW_CONFLICTS\nGIT_CHECKOUT_REMOVE_UNTRACKED\nGIT_CHECKOUT_REMOVE_IGNORED\nGIT_CHECKOUT_UPDATE_ONLY\nGIT_CHECKOUT_DONT_UPDATE_INDEX\nGIT_CHECKOUT_NO_REFRESH\nGIT_CHECKOUT_SKIP_UNMERGED\nGIT_CHECKOUT_USE_OURS\nGIT_CHECKOUT_USE_THEIRS\nGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH\nGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES\nGIT_CHECKOUT_DONT_OVERWRITE_IGNORED\nGIT_CHECKOUT_CONFLICT_STYLE_MERGE\nGIT_CHECKOUT_CONFLICT_STYLE_DIFF3\nGIT_CHECKOUT_DONT_REMOVE_EXISTING\nGIT_CHECKOUT_DONT_WRITE_INDEX\nGIT_CHECKOUT_UPDATE_SUBMODULES\nGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED", + "lineto": 195, + "block": "GIT_CHECKOUT_NONE\nGIT_CHECKOUT_SAFE\nGIT_CHECKOUT_FORCE\nGIT_CHECKOUT_RECREATE_MISSING\nGIT_CHECKOUT_ALLOW_CONFLICTS\nGIT_CHECKOUT_REMOVE_UNTRACKED\nGIT_CHECKOUT_REMOVE_IGNORED\nGIT_CHECKOUT_UPDATE_ONLY\nGIT_CHECKOUT_DONT_UPDATE_INDEX\nGIT_CHECKOUT_NO_REFRESH\nGIT_CHECKOUT_SKIP_UNMERGED\nGIT_CHECKOUT_USE_OURS\nGIT_CHECKOUT_USE_THEIRS\nGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH\nGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES\nGIT_CHECKOUT_DONT_OVERWRITE_IGNORED\nGIT_CHECKOUT_CONFLICT_STYLE_MERGE\nGIT_CHECKOUT_CONFLICT_STYLE_DIFF3\nGIT_CHECKOUT_DONT_REMOVE_EXISTING\nGIT_CHECKOUT_DONT_WRITE_INDEX\nGIT_CHECKOUT_DRY_RUN\nGIT_CHECKOUT_UPDATE_SUBMODULES\nGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED", "tdef": "typedef", "description": " Checkout behavior flags", "comments": "

In libgit2, checkout is used to update the working directory and index to match a target tree. Unlike git checkout, it does not move the HEAD commit for you - use git_repository_set_head or the like to do that.

\n\n

Checkout looks at (up to) four things: the "target" tree you want to check out, the "baseline" tree of what was checked out previously, the working directory for actual files, and the index for staged changes.

\n\n

You give checkout one of three strategies for update:

\n\n\n\n

To emulate git checkout, use GIT_CHECKOUT_SAFE with a checkout notification callback (see below) that displays information about dirty files. The default behavior will cancel checkout on conflicts.

\n\n

To emulate git checkout-index, use GIT_CHECKOUT_SAFE with a notification callback that cancels the operation if a dirty-but-existing file is found in the working directory. This core git command isn't quite "force" but is sensitive about some types of changes.

\n\n

To emulate git checkout -f, use GIT_CHECKOUT_FORCE.

\n\n

There are some additional flags to modify the behavior of checkout:

\n\n\n", @@ -27939,6 +28638,12 @@ "comments": "

Normally checkout writes the index upon completion; this prevents that.

\n", "value": 8388608 }, + { + "type": "int", + "name": "GIT_CHECKOUT_DRY_RUN", + "comments": "

Show what would be done by a checkout. Stop after sending\n notifications; don't update the working directory or index.

\n", + "value": 16777216 + }, { "type": "int", "name": "GIT_CHECKOUT_UPDATE_SUBMODULES", @@ -28148,8 +28853,8 @@ "type": "struct", "value": "git_commit", "file": "git2/types.h", - "line": 127, - "lineto": 127, + "line": 136, + "lineto": 136, "tdef": "typedef", "description": " Parsed representation of a commit object. ", "comments": "", @@ -28167,6 +28872,7 @@ "git_commit_committer_with_mailmap", "git_commit_create", "git_commit_create_buffer", + "git_commit_create_cb", "git_commit_dup", "git_commit_free", "git_commit_header_field", @@ -28193,12 +28899,79 @@ "git_note_commit_iterator_new", "git_note_commit_read", "git_note_commit_remove", + "git_odb_set_commit_graph", "git_revert", "git_revert_commit" ] } } ], + [ + "git_commit_graph", + { + "decl": "git_commit_graph", + "type": "struct", + "value": "git_commit_graph", + "file": "git2/types.h", + "line": 109, + "lineto": 109, + "tdef": "typedef", + "description": " A git commit-graph ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_odb_set_commit_graph" + ] + } + } + ], + [ + "git_commit_graph_split_strategy_t", + { + "decl": [ + "GIT_COMMIT_GRAPH_SPLIT_STRATEGY_SINGLE_FILE" + ], + "type": "enum", + "file": "git2/sys/commit_graph.h", + "line": 92, + "lineto": 98, + "block": "GIT_COMMIT_GRAPH_SPLIT_STRATEGY_SINGLE_FILE", + "tdef": "typedef", + "description": " The strategy to use when adding a new set of commits to a pre-existing\n commit-graph chain.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_COMMIT_GRAPH_SPLIT_STRATEGY_SINGLE_FILE", + "comments": "

Do not split commit-graph files. The other split strategy-related option\n fields are ignored.

\n", + "value": 0 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_commit_graph_writer", + { + "decl": "git_commit_graph_writer", + "type": "struct", + "value": "git_commit_graph_writer", + "file": "git2/types.h", + "line": 112, + "lineto": 112, + "tdef": "typedef", + "description": " a writer for commit-graph files. ", + "comments": "", + "used": { + "returns": [], + "needs": [] + } + } + ], [ "git_config", { @@ -28206,8 +28979,8 @@ "type": "struct", "value": "git_config", "file": "git2/types.h", - "line": 148, - "lineto": 148, + "line": 157, + "lineto": 157, "tdef": "typedef", "description": " Memory representation of a set of config files ", "comments": "", @@ -28263,8 +29036,8 @@ "type": "struct", "value": "git_config_backend", "file": "git2/types.h", - "line": 151, - "lineto": 151, + "line": 160, + "lineto": 160, "tdef": "typedef", "description": " Interface to access a configuration file ", "comments": "", @@ -28774,8 +29547,8 @@ ], "type": "enum", "file": "git2/diff.h", - "line": 220, - "lineto": 232, + "line": 223, + "lineto": 235, "block": "GIT_DELTA_UNMODIFIED\nGIT_DELTA_ADDED\nGIT_DELTA_DELETED\nGIT_DELTA_MODIFIED\nGIT_DELTA_RENAMED\nGIT_DELTA_COPIED\nGIT_DELTA_IGNORED\nGIT_DELTA_UNTRACKED\nGIT_DELTA_TYPECHANGE\nGIT_DELTA_UNREADABLE\nGIT_DELTA_CONFLICTED", "tdef": "typedef", "description": " What type of change is described by a git_diff_delta?", @@ -29040,8 +29813,8 @@ "type": "struct", "value": "git_diff", "file": "git2/diff.h", - "line": 193, - "lineto": 193, + "line": 196, + "lineto": 196, "tdef": "typedef", "description": " The diff object that contains all individual file deltas.", "comments": "

A diff represents the cumulative list of differences between two snapshots of a repository (possibly filtered by a set of file name patterns).

\n\n

Calculating diffs is generally done in two phases: building a list of diffs then traversing it. This makes is easier to share logic across the various types of diffs (tree vs tree, workdir vs index, etc.), and also allows you to insert optional diff post-processing phases, such as rename detection, in between the steps. When you are done with a diff object, it must be freed.

\n\n

This is an opaque structure which will be allocated by one of the diff generator functions below (such as git_diff_tree_to_tree). You are responsible for releasing the object memory when done, using the git_diff_free() function.

\n", @@ -29119,8 +29892,8 @@ "type": "struct", "value": "git_diff_binary", "file": "git2/diff.h", - "line": 513, - "lineto": 525, + "line": 527, + "lineto": 539, "block": "unsigned int contains_data\ngit_diff_binary_file old_file\ngit_diff_binary_file new_file", "tdef": "typedef", "description": " Structure describing the binary contents of a diff.", @@ -29166,8 +29939,8 @@ "type": "struct", "value": "git_diff_binary_file", "file": "git2/diff.h", - "line": 490, - "lineto": 502, + "line": 504, + "lineto": 516, "block": "git_diff_binary_t type\nconst char * data\nsize_t datalen\nsize_t inflatedlen", "tdef": "typedef", "description": " The contents of one of the files in a binary diff. ", @@ -29210,8 +29983,8 @@ ], "type": "enum", "file": "git2/diff.h", - "line": 478, - "lineto": 487, + "line": 492, + "lineto": 501, "block": "GIT_DIFF_BINARY_NONE\nGIT_DIFF_BINARY_LITERAL\nGIT_DIFF_BINARY_DELTA", "tdef": "typedef", "description": " When producing a binary diff, the binary data returned will be\n either the deflated full (\"literal\") contents of the file, or\n the deflated binary delta between the two sides (whichever is\n smaller).", @@ -29256,8 +30029,8 @@ "type": "struct", "value": "git_diff_delta", "file": "git2/diff.h", - "line": 309, - "lineto": 316, + "line": 323, + "lineto": 330, "block": "git_delta_t status\nuint32_t flags\nuint16_t similarity\nuint16_t nfiles\ngit_diff_file old_file\ngit_diff_file new_file", "tdef": "typedef", "description": " Description of changes to one entry.", @@ -29325,42 +30098,42 @@ "type": "struct", "value": "git_diff_file", "file": "git2/diff.h", - "line": 260, - "lineto": 267, + "line": 244, + "lineto": 281, "block": "git_oid id\nconst char * path\ngit_object_size_t size\nuint32_t flags\nuint16_t mode\nuint16_t id_abbrev", "tdef": "typedef", "description": " Description of one side of a delta.", - "comments": "

Although this is called a "file", it could represent a file, a symbolic link, a submodule commit id, or even a tree (although that only if you are tracking type changes or ignored/untracked directories).

\n\n

The id is the git_oid of the item. If the entry represents an absent side of a diff (e.g. the old_file of a GIT_DELTA_ADDED delta), then the oid will be zeroes.

\n\n

path is the NUL-terminated path to the entry relative to the working directory of the repository.

\n\n

size is the size of the entry in bytes.

\n\n

flags is a combination of the git_diff_flag_t types

\n\n

mode is, roughly, the stat() st_mode value for the item. This will be restricted to one of the git_filemode_t values.

\n\n

The id_abbrev represents the known length of the id field, when converted to a hex string. It is generally GIT_OID_HEXSZ, unless this delta was created from reading a patch file, in which case it may be abbreviated to something reasonable, like 7 characters.

\n", + "comments": "

Although this is called a "file", it could represent a file, a symbolic link, a submodule commit id, or even a tree (although that only if you are tracking type changes or ignored/untracked directories).

\n", "fields": [ { "type": "git_oid", "name": "id", - "comments": "" + "comments": " The `git_oid` of the item. If the entry represents an\n absent side of a diff (e.g. the `old_file` of a `GIT_DELTA_ADDED` delta),\n then the oid will be zeroes." }, { "type": "const char *", "name": "path", - "comments": "" + "comments": " The NUL-terminated path to the entry relative to the working\n directory of the repository." }, { "type": "git_object_size_t", "name": "size", - "comments": "" + "comments": " The size of the entry in bytes." }, { "type": "uint32_t", "name": "flags", - "comments": "" + "comments": " A combination of the `git_diff_flag_t` types" }, { "type": "uint16_t", "name": "mode", - "comments": "" + "comments": " Roughly, the stat() `st_mode` value for the item. This will\n be restricted to one of the `git_filemode_t` values." }, { "type": "uint16_t", "name": "id_abbrev", - "comments": "" + "comments": " Represents the known length of the `id` field, when\n converted to a hex string. It is generally `GIT_OID_HEXSZ`, unless this\n delta was created from reading a patch file, in which case it may be\n abbreviated to something reasonable, like 7 characters." } ], "used": { @@ -29391,8 +30164,8 @@ "type": "struct", "value": "git_diff_find_options", "file": "git2/diff.h", - "line": 718, - "lineto": 772, + "line": 732, + "lineto": 786, "block": "unsigned int version\nuint32_t flags\nuint16_t rename_threshold\nuint16_t rename_from_rewrite_threshold\nuint16_t copy_threshold\nuint16_t break_rewrite_threshold\nsize_t rename_limit\ngit_diff_similarity_metric * metric", "tdef": "typedef", "description": " Control behavior of rename and copy detection", @@ -29471,8 +30244,8 @@ ], "type": "enum", "file": "git2/diff.h", - "line": 627, - "lineto": 696, + "line": 641, + "lineto": 710, "block": "GIT_DIFF_FIND_BY_CONFIG\nGIT_DIFF_FIND_RENAMES\nGIT_DIFF_FIND_RENAMES_FROM_REWRITES\nGIT_DIFF_FIND_COPIES\nGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED\nGIT_DIFF_FIND_REWRITES\nGIT_DIFF_BREAK_REWRITES\nGIT_DIFF_FIND_AND_BREAK_REWRITES\nGIT_DIFF_FIND_FOR_UNTRACKED\nGIT_DIFF_FIND_ALL\nGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE\nGIT_DIFF_FIND_IGNORE_WHITESPACE\nGIT_DIFF_FIND_DONT_IGNORE_WHITESPACE\nGIT_DIFF_FIND_EXACT_MATCH_ONLY\nGIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY\nGIT_DIFF_FIND_REMOVE_UNMODIFIED", "tdef": "typedef", "description": " Flags to control the behavior of diff rename/copy detection.", @@ -29592,8 +30365,8 @@ ], "type": "enum", "file": "git2/diff.h", - "line": 203, - "lineto": 208, + "line": 206, + "lineto": 211, "block": "GIT_DIFF_FLAG_BINARY\nGIT_DIFF_FLAG_NOT_BINARY\nGIT_DIFF_FLAG_VALID_ID\nGIT_DIFF_FLAG_EXISTS", "tdef": "typedef", "description": " Flags for the delta object and the file objects on each side.", @@ -29638,9 +30411,9 @@ "GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER" ], "type": "enum", - "file": "git2/diff.h", - "line": 1367, - "lineto": 1374, + "file": "git2/deprecated.h", + "line": 311, + "lineto": 318, "block": "GIT_DIFF_FORMAT_EMAIL_NONE\nGIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER", "tdef": "typedef", "description": " Formatting options for diff e-mail generation", @@ -29680,9 +30453,9 @@ ], "type": "struct", "value": "git_diff_format_email_options", - "file": "git2/diff.h", - "line": 1379, - "lineto": 1402, + "file": "git2/deprecated.h", + "line": 323, + "lineto": 346, "block": "unsigned int version\nuint32_t flags\nsize_t patch_no\nsize_t total_patches\nconst git_oid * id\nconst char * summary\nconst char * body\nconst git_signature * author", "tdef": "typedef", "description": " Options for controlling the formatting of the generated e-mail.", @@ -29751,8 +30524,8 @@ ], "type": "enum", "file": "git2/diff.h", - "line": 1090, - "lineto": 1097, + "line": 1104, + "lineto": 1111, "block": "GIT_DIFF_FORMAT_PATCH\nGIT_DIFF_FORMAT_PATCH_HEADER\nGIT_DIFF_FORMAT_RAW\nGIT_DIFF_FORMAT_NAME_ONLY\nGIT_DIFF_FORMAT_NAME_STATUS\nGIT_DIFF_FORMAT_PATCH_ID", "tdef": "typedef", "description": " Possible output formats for diff data", @@ -29818,8 +30591,8 @@ "type": "struct", "value": "git_diff_hunk", "file": "git2/diff.h", - "line": 545, - "lineto": 552, + "line": 559, + "lineto": 566, "block": "int old_start\nint old_lines\nint new_start\nint new_lines\nsize_t header_len\nchar [128] header", "tdef": "typedef", "description": " Structure describing a hunk of a diff.", @@ -29886,8 +30659,8 @@ "type": "struct", "value": "git_diff_line", "file": "git2/diff.h", - "line": 600, - "lineto": 608, + "line": 614, + "lineto": 622, "block": "char origin\nint old_lineno\nint new_lineno\nint num_lines\nsize_t content_len\ngit_off_t content_offset\nconst char * content", "tdef": "typedef", "description": " Structure describing a line (or data span) of a diff.", @@ -29960,8 +30733,8 @@ ], "type": "enum", "file": "git2/diff.h", - "line": 571, - "lineto": 587, + "line": 585, + "lineto": 601, "block": "GIT_DIFF_LINE_CONTEXT\nGIT_DIFF_LINE_ADDITION\nGIT_DIFF_LINE_DELETION\nGIT_DIFF_LINE_CONTEXT_EOFNL\nGIT_DIFF_LINE_ADD_EOFNL\nGIT_DIFF_LINE_DEL_EOFNL\nGIT_DIFF_LINE_FILE_HDR\nGIT_DIFF_LINE_HUNK_HDR\nGIT_DIFF_LINE_BINARY", "tdef": "typedef", "description": " Line origin constants.", @@ -30052,6 +30825,7 @@ "GIT_DIFF_INCLUDE_UNREADABLE", "GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED", "GIT_DIFF_INDENT_HEURISTIC", + "GIT_DIFF_IGNORE_BLANK_LINES", "GIT_DIFF_FORCE_TEXT", "GIT_DIFF_FORCE_BINARY", "GIT_DIFF_IGNORE_WHITESPACE", @@ -30066,8 +30840,8 @@ "type": "enum", "file": "git2/diff.h", "line": 28, - "lineto": 171, - "block": "GIT_DIFF_NORMAL\nGIT_DIFF_REVERSE\nGIT_DIFF_INCLUDE_IGNORED\nGIT_DIFF_RECURSE_IGNORED_DIRS\nGIT_DIFF_INCLUDE_UNTRACKED\nGIT_DIFF_RECURSE_UNTRACKED_DIRS\nGIT_DIFF_INCLUDE_UNMODIFIED\nGIT_DIFF_INCLUDE_TYPECHANGE\nGIT_DIFF_INCLUDE_TYPECHANGE_TREES\nGIT_DIFF_IGNORE_FILEMODE\nGIT_DIFF_IGNORE_SUBMODULES\nGIT_DIFF_IGNORE_CASE\nGIT_DIFF_INCLUDE_CASECHANGE\nGIT_DIFF_DISABLE_PATHSPEC_MATCH\nGIT_DIFF_SKIP_BINARY_CHECK\nGIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS\nGIT_DIFF_UPDATE_INDEX\nGIT_DIFF_INCLUDE_UNREADABLE\nGIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED\nGIT_DIFF_INDENT_HEURISTIC\nGIT_DIFF_FORCE_TEXT\nGIT_DIFF_FORCE_BINARY\nGIT_DIFF_IGNORE_WHITESPACE\nGIT_DIFF_IGNORE_WHITESPACE_CHANGE\nGIT_DIFF_IGNORE_WHITESPACE_EOL\nGIT_DIFF_SHOW_UNTRACKED_CONTENT\nGIT_DIFF_SHOW_UNMODIFIED\nGIT_DIFF_PATIENCE\nGIT_DIFF_MINIMAL\nGIT_DIFF_SHOW_BINARY", + "lineto": 174, + "block": "GIT_DIFF_NORMAL\nGIT_DIFF_REVERSE\nGIT_DIFF_INCLUDE_IGNORED\nGIT_DIFF_RECURSE_IGNORED_DIRS\nGIT_DIFF_INCLUDE_UNTRACKED\nGIT_DIFF_RECURSE_UNTRACKED_DIRS\nGIT_DIFF_INCLUDE_UNMODIFIED\nGIT_DIFF_INCLUDE_TYPECHANGE\nGIT_DIFF_INCLUDE_TYPECHANGE_TREES\nGIT_DIFF_IGNORE_FILEMODE\nGIT_DIFF_IGNORE_SUBMODULES\nGIT_DIFF_IGNORE_CASE\nGIT_DIFF_INCLUDE_CASECHANGE\nGIT_DIFF_DISABLE_PATHSPEC_MATCH\nGIT_DIFF_SKIP_BINARY_CHECK\nGIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS\nGIT_DIFF_UPDATE_INDEX\nGIT_DIFF_INCLUDE_UNREADABLE\nGIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED\nGIT_DIFF_INDENT_HEURISTIC\nGIT_DIFF_IGNORE_BLANK_LINES\nGIT_DIFF_FORCE_TEXT\nGIT_DIFF_FORCE_BINARY\nGIT_DIFF_IGNORE_WHITESPACE\nGIT_DIFF_IGNORE_WHITESPACE_CHANGE\nGIT_DIFF_IGNORE_WHITESPACE_EOL\nGIT_DIFF_SHOW_UNTRACKED_CONTENT\nGIT_DIFF_SHOW_UNMODIFIED\nGIT_DIFF_PATIENCE\nGIT_DIFF_MINIMAL\nGIT_DIFF_SHOW_BINARY", "tdef": "typedef", "description": " Flags for diff options. A combination of these flags can be passed\n in via the `flags` value in the `git_diff_options`.", "comments": "", @@ -30192,6 +30966,12 @@ "comments": "

Use a heuristic that takes indentation and whitespace into account\n which generally can produce better diffs when dealing with ambiguous\n diff hunks.

\n", "value": 262144 }, + { + "type": "int", + "name": "GIT_DIFF_IGNORE_BLANK_LINES", + "comments": "

Ignore blank lines

\n", + "value": 524288 + }, { "type": "int", "name": "GIT_DIFF_FORCE_TEXT", @@ -30280,8 +31060,8 @@ "type": "struct", "value": "git_diff_options", "file": "git2/diff.h", - "line": 361, - "lineto": 433, + "line": 375, + "lineto": 447, "block": "unsigned int version\nuint32_t flags\ngit_submodule_ignore_t ignore_submodules\ngit_strarray pathspec\ngit_diff_notify_cb notify_cb\ngit_diff_progress_cb progress_cb\nvoid * payload\nuint32_t context_lines\nuint32_t interhunk_lines\nuint16_t id_abbrev\ngit_off_t max_size\nconst char * old_prefix\nconst char * new_prefix", "tdef": "typedef", "description": " Structure describing options about how the diff should be executed.", @@ -30383,8 +31163,8 @@ "type": "struct", "value": "git_diff_patchid_options", "file": "git2/diff.h", - "line": 1464, - "lineto": 1466, + "line": 1385, + "lineto": 1387, "block": "unsigned int version", "tdef": "typedef", "description": " Patch ID options structure", @@ -30418,8 +31198,8 @@ "type": "struct", "value": "git_diff_similarity_metric", "file": "git2/diff.h", - "line": 701, - "lineto": 711, + "line": 715, + "lineto": 725, "block": "int (*)(void **, const git_diff_file *, const char *, void *) file_signature\nint (*)(void **, const git_diff_file *, const char *, size_t, void *) buffer_signature\nvoid (*)(void *, void *) free_signature\nint (*)(int *, void *, void *, void *) similarity\nvoid * payload", "tdef": "typedef", "description": " Pluggable similarity metric", @@ -30464,8 +31244,8 @@ "type": "struct", "value": "git_diff_stats", "file": "git2/diff.h", - "line": 1281, - "lineto": 1281, + "line": 1295, + "lineto": 1295, "tdef": "typedef", "description": " This is an opaque structure which is allocated by `git_diff_get_stats`.\n You are responsible for releasing the object memory when done, using the\n `git_diff_stats_free()` function.", "comments": "", @@ -30494,8 +31274,8 @@ ], "type": "enum", "file": "git2/diff.h", - "line": 1286, - "lineto": 1301, + "line": 1300, + "lineto": 1315, "block": "GIT_DIFF_STATS_NONE\nGIT_DIFF_STATS_FULL\nGIT_DIFF_STATS_SHORT\nGIT_DIFF_STATS_NUMBER\nGIT_DIFF_STATS_INCLUDE_SUMMARY", "tdef": "typedef", "description": " Formatting options for diff stats", @@ -30579,6 +31359,55 @@ } } ], + [ + "git_email_create_flags_t", + { + "decl": [ + "GIT_EMAIL_CREATE_DEFAULT", + "GIT_EMAIL_CREATE_OMIT_NUMBERS", + "GIT_EMAIL_CREATE_ALWAYS_NUMBER", + "GIT_EMAIL_CREATE_NO_RENAMES" + ], + "type": "enum", + "file": "git2/email.h", + "line": 23, + "lineto": 38, + "block": "GIT_EMAIL_CREATE_DEFAULT\nGIT_EMAIL_CREATE_OMIT_NUMBERS\nGIT_EMAIL_CREATE_ALWAYS_NUMBER\nGIT_EMAIL_CREATE_NO_RENAMES", + "tdef": "typedef", + "description": " Formatting options for diff e-mail generation", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_EMAIL_CREATE_DEFAULT", + "comments": "

Normal patch, the default

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_EMAIL_CREATE_OMIT_NUMBERS", + "comments": "

Do not include patch numbers in the subject prefix.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_EMAIL_CREATE_ALWAYS_NUMBER", + "comments": "

Include numbers in the subject prefix even when the\n patch is for a single commit (1/1).

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_EMAIL_CREATE_NO_RENAMES", + "comments": "

Do not perform rename or similarity detection.

\n", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], [ "git_error", { @@ -31184,8 +32013,8 @@ "type": "struct", "value": "git_fetch_options", "file": "git2/remote.h", - "line": 654, - "lineto": 691, + "line": 704, + "lineto": 741, "block": "int version\ngit_remote_callbacks callbacks\ngit_fetch_prune_t prune\nint update_fetchhead\ngit_remote_autotag_option_t download_tags\ngit_proxy_options proxy_opts\ngit_strarray custom_headers", "tdef": "typedef", "description": " Fetch options structure.", @@ -31247,8 +32076,8 @@ ], "type": "enum", "file": "git2/remote.h", - "line": 606, - "lineto": 619, + "line": 656, + "lineto": 669, "block": "GIT_FETCH_PRUNE_UNSPECIFIED\nGIT_FETCH_PRUNE\nGIT_FETCH_NO_PRUNE", "tdef": "typedef", "description": " Acceptable prune settings when fetching ", @@ -31292,8 +32121,8 @@ ], "type": "enum", "file": "git2/types.h", - "line": 213, - "lineto": 220, + "line": 222, + "lineto": 229, "block": "GIT_FILEMODE_UNREADABLE\nGIT_FILEMODE_TREE\nGIT_FILEMODE_BLOB\nGIT_FILEMODE_BLOB_EXECUTABLE\nGIT_FILEMODE_LINK\nGIT_FILEMODE_COMMIT", "tdef": "typedef", "description": " Valid modes for index and tree entries. ", @@ -31354,8 +32183,8 @@ "type": "struct", "value": "git_filter", "file": "git2/filter.h", - "line": 69, - "lineto": 69, + "line": 100, + "lineto": 100, "tdef": "typedef", "description": " A filter that can transform file data", "comments": "

This represents a filter that can be used to transform or even replace file data. Libgit2 includes one built in filter and it is possible to write your own (see git2/sys/filter.h for information on that).

\n\n

The two builtin filters are:

\n\n\n", @@ -31363,12 +32192,15 @@ "returns": [], "needs": [ "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_buffer", "git_filter_list_apply_to_data", "git_filter_list_apply_to_file", "git_filter_list_contains", "git_filter_list_free", "git_filter_list_load", + "git_filter_list_load_ext", "git_filter_list_stream_blob", + "git_filter_list_stream_buffer", "git_filter_list_stream_data", "git_filter_list_stream_file" ] @@ -31382,13 +32214,14 @@ "GIT_FILTER_DEFAULT", "GIT_FILTER_ALLOW_UNSAFE", "GIT_FILTER_NO_SYSTEM_ATTRIBUTES", - "GIT_FILTER_ATTRIBUTES_FROM_HEAD" + "GIT_FILTER_ATTRIBUTES_FROM_HEAD", + "GIT_FILTER_ATTRIBUTES_FROM_COMMIT" ], "type": "enum", "file": "git2/filter.h", "line": 41, - "lineto": 52, - "block": "GIT_FILTER_DEFAULT\nGIT_FILTER_ALLOW_UNSAFE\nGIT_FILTER_NO_SYSTEM_ATTRIBUTES\nGIT_FILTER_ATTRIBUTES_FROM_HEAD", + "lineto": 58, + "block": "GIT_FILTER_DEFAULT\nGIT_FILTER_ALLOW_UNSAFE\nGIT_FILTER_NO_SYSTEM_ATTRIBUTES\nGIT_FILTER_ATTRIBUTES_FROM_HEAD\nGIT_FILTER_ATTRIBUTES_FROM_COMMIT", "tdef": "typedef", "description": " Filter option flags.", "comments": "", @@ -31416,6 +32249,12 @@ "name": "GIT_FILTER_ATTRIBUTES_FROM_HEAD", "comments": "

Load attributes from .gitattributes in the root of HEAD

\n", "value": 4 + }, + { + "type": "int", + "name": "GIT_FILTER_ATTRIBUTES_FROM_COMMIT", + "comments": "

Load attributes from .gitattributes in a given commit.\n This can only be specified in a git_filter_options.

\n", + "value": 8 } ], "used": { @@ -31431,8 +32270,8 @@ "type": "struct", "value": "git_filter_list", "file": "git2/filter.h", - "line": 81, - "lineto": 81, + "line": 112, + "lineto": 112, "tdef": "typedef", "description": " List of filters to be applied", "comments": "

This represents a list of filters to be applied to a file / blob. You can build the list with one call, apply it with another, and dispose it with a third. In typical usage, there are not many occasions where a git_filter_list is needed directly since the library will generally handle conversions for you, but it can be convenient to be able to build and apply the list sometimes.

\n", @@ -31440,12 +32279,15 @@ "returns": [], "needs": [ "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_buffer", "git_filter_list_apply_to_data", "git_filter_list_apply_to_file", "git_filter_list_contains", "git_filter_list_free", "git_filter_list_load", + "git_filter_list_load_ext", "git_filter_list_stream_blob", + "git_filter_list_stream_buffer", "git_filter_list_stream_data", "git_filter_list_stream_file" ] @@ -31498,7 +32340,56 @@ "used": { "returns": [], "needs": [ - "git_filter_list_load" + "git_filter_list_load", + "git_filter_list_load_ext" + ] + } + } + ], + [ + "git_filter_options", + { + "decl": [ + "unsigned int version", + "uint32_t flags", + "git_oid * commit_id", + "git_oid attr_commit_id" + ], + "type": "struct", + "value": "git_filter_options", + "file": "git2/filter.h", + "line": 63, + "lineto": 80, + "block": "unsigned int version\nuint32_t flags\ngit_oid * commit_id\ngit_oid attr_commit_id", + "tdef": "typedef", + "description": " Filtering options", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "uint32_t", + "name": "flags", + "comments": " See `git_filter_flag_t` above " + }, + { + "type": "git_oid *", + "name": "commit_id", + "comments": "" + }, + { + "type": "git_oid", + "name": "attr_commit_id", + "comments": " The commit to load attributes from, when\n `GIT_FILTER_ATTRIBUTES_FROM_COMMIT` is specified." + } + ], + "used": { + "returns": [], + "needs": [ + "git_filter_list_load_ext" ] } } @@ -31577,8 +32468,8 @@ "type": "struct", "value": "git_index", "file": "git2/types.h", - "line": 139, - "lineto": 139, + "line": 148, + "lineto": 148, "tdef": "typedef", "description": " Memory representation of an index file. ", "comments": "", @@ -31763,8 +32654,8 @@ "type": "struct", "value": "git_index_conflict_iterator", "file": "git2/types.h", - "line": 145, - "lineto": 145, + "line": 154, + "lineto": 154, "tdef": "typedef", "description": " An iterator for conflicts in the index. ", "comments": "", @@ -31976,8 +32867,8 @@ "type": "struct", "value": "git_index_iterator", "file": "git2/types.h", - "line": 142, - "lineto": 142, + "line": 151, + "lineto": 151, "tdef": "typedef", "description": " An iterator for entries in the index. ", "comments": "", @@ -32124,7 +33015,7 @@ "value": "git_indexer_options", "file": "git2/indexer.h", "line": 62, - "lineto": 72, + "lineto": 73, "block": "unsigned int version\ngit_indexer_progress_cb progress_cb\nvoid * progress_cb_payload\nunsigned char verify", "tdef": "typedef", "description": " Options for indexer configuration", @@ -32266,13 +33157,17 @@ "GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS", "GIT_OPT_ENABLE_HTTP_EXPECT_CONTINUE", "GIT_OPT_GET_MWINDOW_FILE_LIMIT", - "GIT_OPT_SET_MWINDOW_FILE_LIMIT" + "GIT_OPT_SET_MWINDOW_FILE_LIMIT", + "GIT_OPT_SET_ODB_PACKED_PRIORITY", + "GIT_OPT_SET_ODB_LOOSE_PRIORITY", + "GIT_OPT_GET_EXTENSIONS", + "GIT_OPT_SET_EXTENSIONS" ], "type": "enum", "file": "git2/common.h", "line": 179, - "lineto": 211, - "block": "GIT_OPT_GET_MWINDOW_SIZE\nGIT_OPT_SET_MWINDOW_SIZE\nGIT_OPT_GET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_SET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_GET_SEARCH_PATH\nGIT_OPT_SET_SEARCH_PATH\nGIT_OPT_SET_CACHE_OBJECT_LIMIT\nGIT_OPT_SET_CACHE_MAX_SIZE\nGIT_OPT_ENABLE_CACHING\nGIT_OPT_GET_CACHED_MEMORY\nGIT_OPT_GET_TEMPLATE_PATH\nGIT_OPT_SET_TEMPLATE_PATH\nGIT_OPT_SET_SSL_CERT_LOCATIONS\nGIT_OPT_SET_USER_AGENT\nGIT_OPT_ENABLE_STRICT_OBJECT_CREATION\nGIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION\nGIT_OPT_SET_SSL_CIPHERS\nGIT_OPT_GET_USER_AGENT\nGIT_OPT_ENABLE_OFS_DELTA\nGIT_OPT_ENABLE_FSYNC_GITDIR\nGIT_OPT_GET_WINDOWS_SHAREMODE\nGIT_OPT_SET_WINDOWS_SHAREMODE\nGIT_OPT_ENABLE_STRICT_HASH_VERIFICATION\nGIT_OPT_SET_ALLOCATOR\nGIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY\nGIT_OPT_GET_PACK_MAX_OBJECTS\nGIT_OPT_SET_PACK_MAX_OBJECTS\nGIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS\nGIT_OPT_ENABLE_HTTP_EXPECT_CONTINUE\nGIT_OPT_GET_MWINDOW_FILE_LIMIT\nGIT_OPT_SET_MWINDOW_FILE_LIMIT", + "lineto": 215, + "block": "GIT_OPT_GET_MWINDOW_SIZE\nGIT_OPT_SET_MWINDOW_SIZE\nGIT_OPT_GET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_SET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_GET_SEARCH_PATH\nGIT_OPT_SET_SEARCH_PATH\nGIT_OPT_SET_CACHE_OBJECT_LIMIT\nGIT_OPT_SET_CACHE_MAX_SIZE\nGIT_OPT_ENABLE_CACHING\nGIT_OPT_GET_CACHED_MEMORY\nGIT_OPT_GET_TEMPLATE_PATH\nGIT_OPT_SET_TEMPLATE_PATH\nGIT_OPT_SET_SSL_CERT_LOCATIONS\nGIT_OPT_SET_USER_AGENT\nGIT_OPT_ENABLE_STRICT_OBJECT_CREATION\nGIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION\nGIT_OPT_SET_SSL_CIPHERS\nGIT_OPT_GET_USER_AGENT\nGIT_OPT_ENABLE_OFS_DELTA\nGIT_OPT_ENABLE_FSYNC_GITDIR\nGIT_OPT_GET_WINDOWS_SHAREMODE\nGIT_OPT_SET_WINDOWS_SHAREMODE\nGIT_OPT_ENABLE_STRICT_HASH_VERIFICATION\nGIT_OPT_SET_ALLOCATOR\nGIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY\nGIT_OPT_GET_PACK_MAX_OBJECTS\nGIT_OPT_SET_PACK_MAX_OBJECTS\nGIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS\nGIT_OPT_ENABLE_HTTP_EXPECT_CONTINUE\nGIT_OPT_GET_MWINDOW_FILE_LIMIT\nGIT_OPT_SET_MWINDOW_FILE_LIMIT\nGIT_OPT_SET_ODB_PACKED_PRIORITY\nGIT_OPT_SET_ODB_LOOSE_PRIORITY\nGIT_OPT_GET_EXTENSIONS\nGIT_OPT_SET_EXTENSIONS", "tdef": "typedef", "description": " Global library options", "comments": "

These are used to select which global option to set or get and are used in git_libgit2_opts().

\n", @@ -32462,6 +33357,30 @@ "name": "GIT_OPT_SET_MWINDOW_FILE_LIMIT", "comments": "", "value": 30 + }, + { + "type": "int", + "name": "GIT_OPT_SET_ODB_PACKED_PRIORITY", + "comments": "", + "value": 31 + }, + { + "type": "int", + "name": "GIT_OPT_SET_ODB_LOOSE_PRIORITY", + "comments": "", + "value": 32 + }, + { + "type": "int", + "name": "GIT_OPT_GET_EXTENSIONS", + "comments": "", + "value": 33 + }, + { + "type": "int", + "name": "GIT_OPT_SET_EXTENSIONS", + "comments": "", + "value": 34 } ], "used": { @@ -32477,8 +33396,8 @@ "type": "struct", "value": "git_mailmap", "file": "git2/types.h", - "line": 357, - "lineto": 357, + "line": 366, + "lineto": 366, "tdef": "typedef", "description": " Representation of .mailmap file state. ", "comments": "", @@ -33144,6 +34063,24 @@ } } ], + [ + "git_midx_writer", + { + "decl": "git_midx_writer", + "type": "struct", + "value": "git_midx_writer", + "file": "git2/types.h", + "line": 100, + "lineto": 100, + "tdef": "typedef", + "description": " a writer for multi-pack-index files. ", + "comments": "", + "used": { + "returns": [], + "needs": [] + } + } + ], [ "git_note", { @@ -33151,8 +34088,8 @@ "type": "struct", "value": "git_note", "file": "git2/types.h", - "line": 160, - "lineto": 160, + "line": 169, + "lineto": 169, "tdef": "typedef", "description": " Representation of a git note ", "comments": "", @@ -33205,8 +34142,8 @@ "type": "struct", "value": "git_object", "file": "git2/types.h", - "line": 115, - "lineto": 115, + "line": 124, + "lineto": 124, "tdef": "typedef", "description": " Representation of a generic object in a repository ", "comments": "", @@ -33399,11 +34336,13 @@ "git_odb_read_header", "git_odb_read_prefix", "git_odb_refresh", + "git_odb_set_commit_graph", "git_odb_stream_finalize_write", "git_odb_stream_free", "git_odb_stream_read", "git_odb_stream_write", "git_odb_write", + "git_odb_write_multi_pack_index", "git_odb_write_pack", "git_repository_odb", "git_repository_wrap_odb" @@ -33447,8 +34386,8 @@ "type": "struct", "value": "git_odb_expand_id", "file": "git2/odb.h", - "line": 181, - "lineto": 196, + "line": 176, + "lineto": 191, "block": "git_oid id\nunsigned short length\ngit_object_t type", "tdef": "typedef", "description": " The information about object IDs to query in `git_odb_expand_ids`,\n which will be populated upon return.", @@ -33724,6 +34663,7 @@ "git_blob_lookup_prefix", "git_commit_amend", "git_commit_create", + "git_commit_create_cb", "git_commit_create_v", "git_commit_create_with_signature", "git_commit_extract_signature", @@ -33732,6 +34672,7 @@ "git_diff_patchid", "git_graph_ahead_behind", "git_graph_descendant_of", + "git_graph_reachable_from_any", "git_index_write_tree", "git_index_write_tree_to", "git_merge_base", @@ -33779,6 +34720,7 @@ "git_oid_streq", "git_oid_tostr", "git_oid_tostr_s", + "git_oidarray_dispose", "git_oidarray_free", "git_packbuilder_insert", "git_packbuilder_insert_commit", @@ -33875,6 +34817,7 @@ "needs": [ "git_merge_bases", "git_merge_bases_many", + "git_oidarray_dispose", "git_oidarray_free" ] } @@ -33887,8 +34830,8 @@ "type": "struct", "value": "git_packbuilder", "file": "git2/types.h", - "line": 163, - "lineto": 163, + "line": 172, + "lineto": 172, "tdef": "typedef", "description": " Representation of a git packbuilder ", "comments": "", @@ -34266,8 +35209,8 @@ "type": "struct", "value": "git_push", "file": "git2/types.h", - "line": 244, - "lineto": 244, + "line": 253, + "lineto": 253, "tdef": "typedef", "description": " Preparation for a push operation. Can be used to configure what to\n push and the level of parallelism of the packfile builder.", "comments": "", @@ -34295,8 +35238,8 @@ "type": "struct", "value": "git_push_options", "file": "git2/remote.h", - "line": 715, - "lineto": 742, + "line": 765, + "lineto": 792, "block": "unsigned int version\nunsigned int pb_parallelism\ngit_remote_callbacks callbacks\ngit_proxy_options proxy_opts\ngit_strarray custom_headers", "tdef": "typedef", "description": " Controls the behavior of a git_push object.", @@ -34350,8 +35293,8 @@ "type": "struct", "value": "git_push_update", "file": "git2/remote.h", - "line": 436, - "lineto": 453, + "line": 459, + "lineto": 476, "block": "char * src_refname\nchar * dst_refname\ngit_oid src\ngit_oid dst", "tdef": "typedef", "description": " Represents an update which will be performed on the remote during push", @@ -34393,8 +35336,8 @@ "type": "struct", "value": "git_rebase", "file": "git2/types.h", - "line": 195, - "lineto": 195, + "line": 204, + "lineto": 204, "tdef": "typedef", "description": " Representation of a rebase ", "comments": "", @@ -34434,8 +35377,8 @@ "type": "struct", "value": "git_rebase_operation", "file": "git2/rebase.h", - "line": 148, - "lineto": 163, + "line": 172, + "lineto": 187, "block": "git_rebase_operation_t type\nconst git_oid id\nconst char * exec", "tdef": "typedef", "description": " A rebase operation", @@ -34480,8 +35423,8 @@ ], "type": "enum", "file": "git2/rebase.h", - "line": 96, - "lineto": 132, + "line": 120, + "lineto": 156, "block": "GIT_REBASE_OPERATION_PICK\nGIT_REBASE_OPERATION_REWORD\nGIT_REBASE_OPERATION_EDIT\nGIT_REBASE_OPERATION_SQUASH\nGIT_REBASE_OPERATION_FIXUP\nGIT_REBASE_OPERATION_EXEC", "tdef": "typedef", "description": " Type of rebase operation in-progress after calling `git_rebase_next`.", @@ -34540,15 +35483,16 @@ "const char * rewrite_notes_ref", "git_merge_options merge_options", "git_checkout_options checkout_options", - "git_commit_signing_cb signing_cb", + "git_commit_create_cb commit_create_cb", + "int (*)(git_buf *, git_buf *, const char *, void *) signing_cb", "void * payload" ], "type": "struct", "value": "git_rebase_options", "file": "git2/rebase.h", "line": 32, - "lineto": 91, - "block": "unsigned int version\nint quiet\nint inmemory\nconst char * rewrite_notes_ref\ngit_merge_options merge_options\ngit_checkout_options checkout_options\ngit_commit_signing_cb signing_cb\nvoid * payload", + "lineto": 115, + "block": "unsigned int version\nint quiet\nint inmemory\nconst char * rewrite_notes_ref\ngit_merge_options merge_options\ngit_checkout_options checkout_options\ngit_commit_create_cb commit_create_cb\nint (*)(git_buf *, git_buf *, const char *, void *) signing_cb\nvoid * payload", "tdef": "typedef", "description": " Rebase options", "comments": "

Use to tell the rebase machinery how to operate.

\n", @@ -34584,9 +35528,14 @@ "comments": " Options to control how files are written during `git_rebase_init`,\n `git_rebase_next` and `git_rebase_abort`. Note that a minimum\n strategy of `GIT_CHECKOUT_SAFE` is defaulted in `init` and `next`,\n and a minimum strategy of `GIT_CHECKOUT_FORCE` is defaulted in\n `abort` to match git semantics." }, { - "type": "git_commit_signing_cb", + "type": "git_commit_create_cb", + "name": "commit_create_cb", + "comments": " Optional callback that allows users to override commit\n creation in `git_rebase_commit`. If specified, users can\n create their own commit and provide the commit ID, which\n may be useful for signing commits or otherwise customizing\n the commit creation.\n\n If this callback returns `GIT_PASSTHROUGH`, then\n `git_rebase_commit` will continue to create the commit." + }, + { + "type": "int (*)(git_buf *, git_buf *, const char *, void *)", "name": "signing_cb", - "comments": " If provided, this will be called with the commit content, allowing\n a signature to be added to the rebase commit. Can be skipped with\n GIT_PASSTHROUGH. If GIT_PASSTHROUGH is returned, a commit will be made\n without a signature.\n This field is only used when performing git_rebase_commit." + "comments": " If provided, this will be called with the commit content, allowing\n a signature to be added to the rebase commit. Can be skipped with\n GIT_PASSTHROUGH. If GIT_PASSTHROUGH is returned, a commit will be made\n without a signature.\n\n This field is only used when performing git_rebase_commit.\n\n This callback is not invoked if a `git_commit_create_cb` is\n specified.\n\n This callback is deprecated; users should provide a\n creation callback as `commit_create_cb` that produces a\n commit buffer, signs it, and commits it." }, { "type": "void *", @@ -34611,8 +35560,8 @@ "type": "struct", "value": "git_refdb", "file": "git2/types.h", - "line": 100, - "lineto": 100, + "line": 103, + "lineto": 103, "tdef": "typedef", "description": " An open refs database handle. ", "comments": "", @@ -34635,8 +35584,8 @@ "type": "struct", "value": "git_refdb_backend", "file": "git2/types.h", - "line": 103, - "lineto": 103, + "line": 106, + "lineto": 106, "tdef": "typedef", "description": " A custom backend for refs ", "comments": "", @@ -34653,8 +35602,8 @@ "type": "struct", "value": "git_reference", "file": "git2/types.h", - "line": 180, - "lineto": 180, + "line": 189, + "lineto": 189, "tdef": "typedef", "description": " In-memory representation of a reference. ", "comments": "", @@ -34729,8 +35678,8 @@ ], "type": "enum", "file": "git2/refs.h", - "line": 658, - "lineto": 687, + "line": 661, + "lineto": 690, "block": "GIT_REFERENCE_FORMAT_NORMAL\nGIT_REFERENCE_FORMAT_ALLOW_ONELEVEL\nGIT_REFERENCE_FORMAT_REFSPEC_PATTERN\nGIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND", "tdef": "typedef", "description": " Normalization options for reference lookup", @@ -34774,8 +35723,8 @@ "type": "struct", "value": "git_reference_iterator", "file": "git2/types.h", - "line": 183, - "lineto": 183, + "line": 192, + "lineto": 192, "tdef": "typedef", "description": " Iterator for references ", "comments": "", @@ -34802,8 +35751,8 @@ ], "type": "enum", "file": "git2/types.h", - "line": 198, - "lineto": 203, + "line": 207, + "lineto": 212, "block": "GIT_REFERENCE_INVALID\nGIT_REFERENCE_DIRECT\nGIT_REFERENCE_SYMBOLIC\nGIT_REFERENCE_ALL", "tdef": "typedef", "description": " Basic type of any Git reference. ", @@ -34849,8 +35798,8 @@ "type": "struct", "value": "git_reflog", "file": "git2/types.h", - "line": 157, - "lineto": 157, + "line": 166, + "lineto": 166, "tdef": "typedef", "description": " Representation of a reference log ", "comments": "", @@ -34882,8 +35831,8 @@ "type": "struct", "value": "git_reflog_entry", "file": "git2/types.h", - "line": 154, - "lineto": 154, + "line": 163, + "lineto": 163, "tdef": "typedef", "description": " Representation of a reference log entry ", "comments": "", @@ -34907,8 +35856,8 @@ "type": "struct", "value": "git_refspec", "file": "git2/types.h", - "line": 226, - "lineto": 226, + "line": 235, + "lineto": 235, "tdef": "typedef", "description": " A refspec specifies the mapping between remote and local reference\n names when fetch or pushing.", "comments": "", @@ -34939,8 +35888,8 @@ "type": "struct", "value": "git_remote", "file": "git2/types.h", - "line": 232, - "lineto": 232, + "line": 241, + "lineto": 241, "tdef": "typedef", "description": " Git's idea of a remote repository. A remote can be anonymous (in\n which case it does not have backing configuration entires).", "comments": "", @@ -34978,8 +35927,11 @@ "git_remote_prune_refs", "git_remote_push", "git_remote_pushurl", + "git_remote_ready_cb", "git_remote_refspec_count", "git_remote_set_autotag", + "git_remote_set_instance_pushurl", + "git_remote_set_instance_url", "git_remote_stats", "git_remote_stop", "git_remote_update_tips", @@ -35001,8 +35953,8 @@ ], "type": "enum", "file": "git2/remote.h", - "line": 626, - "lineto": 644, + "line": 676, + "lineto": 694, "block": "GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED\nGIT_REMOTE_DOWNLOAD_TAGS_AUTO\nGIT_REMOTE_DOWNLOAD_TAGS_NONE\nGIT_REMOTE_DOWNLOAD_TAGS_ALL", "tdef": "typedef", "description": " Automatic tag following option", @@ -35060,15 +36012,16 @@ "git_push_update_reference_cb push_update_reference", "git_push_negotiation push_negotiation", "git_transport_cb transport", + "git_remote_ready_cb remote_ready", "void * payload", "git_url_resolve_cb resolve_url" ], "type": "struct", "value": "git_remote_callbacks", "file": "git2/remote.h", - "line": 499, - "lineto": 588, - "block": "unsigned int version\ngit_transport_message_cb sideband_progress\nint (*)(git_remote_completion_t, void *) completion\ngit_credential_acquire_cb credentials\ngit_transport_certificate_check_cb certificate_check\ngit_indexer_progress_cb transfer_progress\nint (*)(const char *, const git_oid *, const git_oid *, void *) update_tips\ngit_packbuilder_progress pack_progress\ngit_push_transfer_progress_cb push_transfer_progress\ngit_push_update_reference_cb push_update_reference\ngit_push_negotiation push_negotiation\ngit_transport_cb transport\nvoid * payload\ngit_url_resolve_cb resolve_url", + "line": 537, + "lineto": 638, + "block": "unsigned int version\ngit_transport_message_cb sideband_progress\nint (*)(git_remote_completion_t, void *) completion\ngit_credential_acquire_cb credentials\ngit_transport_certificate_check_cb certificate_check\ngit_indexer_progress_cb transfer_progress\nint (*)(const char *, const git_oid *, const git_oid *, void *) update_tips\ngit_packbuilder_progress pack_progress\ngit_push_transfer_progress_cb push_transfer_progress\ngit_push_update_reference_cb push_update_reference\ngit_push_negotiation push_negotiation\ngit_transport_cb transport\ngit_remote_ready_cb remote_ready\nvoid * payload\ngit_url_resolve_cb resolve_url", "tdef": null, "description": " The callback settings structure", "comments": "

Set the callbacks to be called by the remote when informing the user about the progress of the network operations.

\n", @@ -35133,6 +36086,11 @@ "name": "transport", "comments": " Create the transport to use for this operation. Leave NULL\n to auto-detect." }, + { + "type": "git_remote_ready_cb", + "name": "remote_ready", + "comments": " Callback when the remote is ready to connect." + }, { "type": "void *", "name": "payload", @@ -35141,7 +36099,7 @@ { "type": "git_url_resolve_cb", "name": "resolve_url", - "comments": " Resolve URL before connecting to remote.\n The returned URL will be used to connect to the remote instead." + "comments": " Resolve URL before connecting to remote.\n The returned URL will be used to connect to the remote instead.\n\n This callback is deprecated; users should use\n git_remote_ready_cb and configure the instance URL instead." } ], "used": { @@ -35165,8 +36123,8 @@ ], "type": "enum", "file": "git2/remote.h", - "line": 420, - "lineto": 424, + "line": 443, + "lineto": 447, "block": "GIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR\nGIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR", "tdef": "typedef", "description": " Argument to the completion callback which tells it which operation\n finished.", @@ -35349,8 +36307,8 @@ "type": "struct", "value": "git_repository", "file": "git2/types.h", - "line": 109, - "lineto": 109, + "line": 118, + "lineto": 118, "tdef": "typedef", "description": " Representation of an existing git repository,\n including all its object contents", "comments": "", @@ -35378,8 +36336,11 @@ "git_attr_add_macro", "git_attr_cache_flush", "git_attr_foreach", + "git_attr_foreach_ext", "git_attr_get", + "git_attr_get_ext", "git_attr_get_many", + "git_attr_get_many_ext", "git_blame_file", "git_blob_create_from_buffer", "git_blob_create_from_disk", @@ -35392,6 +36353,7 @@ "git_branch_iterator_new", "git_branch_lookup", "git_branch_remote_name", + "git_branch_upstream_merge", "git_branch_upstream_name", "git_branch_upstream_remote", "git_checkout_head", @@ -35418,9 +36380,11 @@ "git_diff_tree_to_workdir_with_index", "git_filter_list_apply_to_file", "git_filter_list_load", + "git_filter_list_load_ext", "git_filter_list_stream_file", "git_graph_ahead_behind", "git_graph_descendant_of", + "git_graph_reachable_from_any", "git_ignore_add_rule", "git_ignore_clear_internal_rules", "git_ignore_path_is_ignored", @@ -35975,8 +36939,8 @@ ], "type": "enum", "file": "git2/repository.h", - "line": 865, - "lineto": 878, + "line": 867, + "lineto": 880, "block": "GIT_REPOSITORY_STATE_NONE\nGIT_REPOSITORY_STATE_MERGE\nGIT_REPOSITORY_STATE_REVERT\nGIT_REPOSITORY_STATE_REVERT_SEQUENCE\nGIT_REPOSITORY_STATE_CHERRYPICK\nGIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE\nGIT_REPOSITORY_STATE_BISECT\nGIT_REPOSITORY_STATE_REBASE\nGIT_REPOSITORY_STATE_REBASE_INTERACTIVE\nGIT_REPOSITORY_STATE_REBASE_MERGE\nGIT_REPOSITORY_STATE_APPLY_MAILBOX\nGIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE", "tdef": "typedef", "description": " Repository state", @@ -36246,8 +37210,8 @@ "type": "struct", "value": "git_revwalk", "file": "git2/types.h", - "line": 118, - "lineto": 118, + "line": 127, + "lineto": 127, "tdef": "typedef", "description": " Representation of an in-progress walk through the commits in a repo ", "comments": "", @@ -36287,8 +37251,8 @@ "type": "struct", "value": "git_signature", "file": "git2/types.h", - "line": 173, - "lineto": 177, + "line": 182, + "lineto": 186, "block": "char * name\nchar * email\ngit_time when", "tdef": "typedef", "description": " An action signature (e.g. for committers, taggers, etc) ", @@ -36325,6 +37289,7 @@ "git_commit_committer_with_mailmap", "git_commit_create", "git_commit_create_buffer", + "git_commit_create_cb", "git_commit_create_v", "git_mailmap_resolve_signature", "git_note_commit_create", @@ -36360,8 +37325,8 @@ ], "type": "enum", "file": "git2/sys/transport.h", - "line": 287, - "lineto": 292, + "line": 288, + "lineto": 293, "block": "GIT_SERVICE_UPLOADPACK_LS\nGIT_SERVICE_UPLOADPACK\nGIT_SERVICE_RECEIVEPACK_LS\nGIT_SERVICE_RECEIVEPACK", "tdef": "typedef", "description": " Actions that the smart transport can ask a subtransport to perform ", @@ -36677,8 +37642,8 @@ "type": "struct", "value": "git_status_entry", "file": "git2/status.h", - "line": 230, - "lineto": 234, + "line": 286, + "lineto": 290, "block": "git_status_t status\ngit_diff_delta * head_to_index\ngit_diff_delta * index_to_workdir", "tdef": "typedef", "description": " A status entry, providing the differences between the file as it exists\n in HEAD and the index, and providing the differences between the index\n and the working directory.", @@ -36715,8 +37680,8 @@ "type": "struct", "value": "git_status_list", "file": "git2/types.h", - "line": 192, - "lineto": 192, + "line": 201, + "lineto": 201, "tdef": "typedef", "description": " Representation of a status collection ", "comments": "", @@ -36754,107 +37719,107 @@ ], "type": "enum", "file": "git2/status.h", - "line": 139, - "lineto": 156, + "line": 101, + "lineto": 208, "block": "GIT_STATUS_OPT_INCLUDE_UNTRACKED\nGIT_STATUS_OPT_INCLUDE_IGNORED\nGIT_STATUS_OPT_INCLUDE_UNMODIFIED\nGIT_STATUS_OPT_EXCLUDE_SUBMODULES\nGIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS\nGIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH\nGIT_STATUS_OPT_RECURSE_IGNORED_DIRS\nGIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX\nGIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR\nGIT_STATUS_OPT_SORT_CASE_SENSITIVELY\nGIT_STATUS_OPT_SORT_CASE_INSENSITIVELY\nGIT_STATUS_OPT_RENAMES_FROM_REWRITES\nGIT_STATUS_OPT_NO_REFRESH\nGIT_STATUS_OPT_UPDATE_INDEX\nGIT_STATUS_OPT_INCLUDE_UNREADABLE\nGIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED", "tdef": "typedef", "description": " Flags to control status callbacks", - "comments": "\n\n

Calling git_status_foreach() is like calling the extended version with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED, and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. Those options are bundled together as GIT_STATUS_OPT_DEFAULTS if you want them as a baseline.

\n", + "comments": "

Calling git_status_foreach() is like calling the extended version with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED, and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. Those options are bundled together as GIT_STATUS_OPT_DEFAULTS if you want them as a baseline.

\n", "fields": [ { "type": "int", "name": "GIT_STATUS_OPT_INCLUDE_UNTRACKED", - "comments": "", + "comments": "

Says that callbacks should be made on untracked files.\n These will only be made if the workdir files are included in the status\n "show" option.

\n", "value": 1 }, { "type": "int", "name": "GIT_STATUS_OPT_INCLUDE_IGNORED", - "comments": "", + "comments": "

Says that ignored files get callbacks.\n Again, these callbacks will only be made if the workdir files are\n included in the status "show" option.

\n", "value": 2 }, { "type": "int", "name": "GIT_STATUS_OPT_INCLUDE_UNMODIFIED", - "comments": "", + "comments": "

Indicates that callback should be made even on unmodified files.

\n", "value": 4 }, { "type": "int", "name": "GIT_STATUS_OPT_EXCLUDE_SUBMODULES", - "comments": "", + "comments": "

Indicates that submodules should be skipped.\n This only applies if there are no pending typechanges to the submodule\n (either from or to another type).

\n", "value": 8 }, { "type": "int", "name": "GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS", - "comments": "", + "comments": "

Indicates that all files in untracked directories should be included.\n Normally if an entire directory is new, then just the top-level\n directory is included (with a trailing slash on the entry name).\n This flag says to include all of the individual files in the directory\n instead.

\n", "value": 16 }, { "type": "int", "name": "GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH", - "comments": "", + "comments": "

Indicates that the given path should be treated as a literal path,\n and not as a pathspec pattern.

\n", "value": 32 }, { "type": "int", "name": "GIT_STATUS_OPT_RECURSE_IGNORED_DIRS", - "comments": "", + "comments": "

Indicates that the contents of ignored directories should be included\n in the status. This is like doing git ls-files -o -i --exclude-standard\n with core git.

\n", "value": 64 }, { "type": "int", "name": "GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX", - "comments": "", + "comments": "

Indicates that rename detection should be processed between the head and\n the index and enables the GIT_STATUS_INDEX_RENAMED as a possible status\n flag.

\n", "value": 128 }, { "type": "int", "name": "GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR", - "comments": "", + "comments": "

Indicates that rename detection should be run between the index and the\n working directory and enabled GIT_STATUS_WT_RENAMED as a possible status\n flag.

\n", "value": 256 }, { "type": "int", "name": "GIT_STATUS_OPT_SORT_CASE_SENSITIVELY", - "comments": "", + "comments": "

Overrides the native case sensitivity for the file system and forces\n the output to be in case-sensitive order.

\n", "value": 512 }, { "type": "int", "name": "GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY", - "comments": "", + "comments": "

Overrides the native case sensitivity for the file system and forces\n the output to be in case-insensitive order.

\n", "value": 1024 }, { "type": "int", "name": "GIT_STATUS_OPT_RENAMES_FROM_REWRITES", - "comments": "", + "comments": "

Iindicates that rename detection should include rewritten files.

\n", "value": 2048 }, { "type": "int", "name": "GIT_STATUS_OPT_NO_REFRESH", - "comments": "", + "comments": "

Bypasses the default status behavior of doing a "soft" index reload\n (i.e. reloading the index data if the file on disk has been modified\n outside libgit2).

\n", "value": 4096 }, { "type": "int", "name": "GIT_STATUS_OPT_UPDATE_INDEX", - "comments": "", + "comments": "

Tells libgit2 to refresh the stat cache in the index for files that are\n unchanged but have out of date stat einformation in the index.\n It will result in less work being done on subsequent calls to get status.\n This is mutually exclusive with the NO_REFRESH option.

\n", "value": 8192 }, { "type": "int", "name": "GIT_STATUS_OPT_INCLUDE_UNREADABLE", - "comments": "", + "comments": "

Normally files that cannot be opened or read are ignored as\n these are often transient files; this option will return\n unreadable files as GIT_STATUS_WT_UNREADABLE.

\n", "value": 16384 }, { "type": "int", "name": "GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED", - "comments": "", + "comments": "

Unreadable files will be detected and given the status\n untracked instead of unreadable.

\n", "value": 32768 } ], @@ -36877,8 +37842,8 @@ "type": "struct", "value": "git_status_options", "file": "git2/status.h", - "line": 170, - "lineto": 197, + "line": 222, + "lineto": 253, "block": "unsigned int version\ngit_status_show_t show\nunsigned int flags\ngit_strarray pathspec\ngit_tree * baseline", "tdef": "typedef", "description": " Options to control how `git_status_foreach_ext()` will issue callbacks.", @@ -36887,7 +37852,7 @@ { "type": "unsigned int", "name": "version", - "comments": " The version " + "comments": " The struct version; pass `GIT_STATUS_OPTIONS_VERSION`." }, { "type": "git_status_show_t", @@ -36897,17 +37862,17 @@ { "type": "unsigned int", "name": "flags", - "comments": " The `flags` value is an OR'ed combination of the `git_status_opt_t`\n values above." + "comments": " The `flags` value is an OR'ed combination of the\n `git_status_opt_t` values above." }, { "type": "git_strarray", "name": "pathspec", - "comments": " The `pathspec` is an array of path patterns to match (using\n fnmatch-style matching), or just an array of paths to match exactly if\n `GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH` is specified in the flags." + "comments": " The `pathspec` is an array of path patterns to match (using\n fnmatch-style matching), or just an array of paths to match\n exactly if `GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH` is specified\n in the flags." }, { "type": "git_tree *", "name": "baseline", - "comments": " The `baseline` is the tree to be used for comparison to the working directory\n and index; defaults to HEAD." + "comments": " The `baseline` is the tree to be used for comparison to the\n working directory and index; defaults to HEAD." } ], "used": { @@ -36930,29 +37895,29 @@ ], "type": "enum", "file": "git2/status.h", - "line": 81, - "lineto": 85, + "line": 73, + "lineto": 91, "block": "GIT_STATUS_SHOW_INDEX_AND_WORKDIR\nGIT_STATUS_SHOW_INDEX_ONLY\nGIT_STATUS_SHOW_WORKDIR_ONLY", "tdef": "typedef", "description": " Select the files on which to report status.", - "comments": "

With git_status_foreach_ext, this will control which changes get callbacks. With git_status_list_new, these will control which changes are included in the list.

\n\n\n", + "comments": "

With git_status_foreach_ext, this will control which changes get callbacks. With git_status_list_new, these will control which changes are included in the list.

\n", "fields": [ { "type": "int", "name": "GIT_STATUS_SHOW_INDEX_AND_WORKDIR", - "comments": "", + "comments": "

The default. This roughly matches git status --porcelain regarding\n which files are included and in what order.

\n", "value": 0 }, { "type": "int", "name": "GIT_STATUS_SHOW_INDEX_ONLY", - "comments": "", + "comments": "

Only gives status based on HEAD to index comparison, not looking at\n working directory changes.

\n", "value": 1 }, { "type": "int", "name": "GIT_STATUS_SHOW_WORKDIR_ONLY", - "comments": "", + "comments": "

Only gives status based on index to working directory comparison,\n not comparing the index to the HEAD.

\n", "value": 2 } ], @@ -37179,8 +38144,8 @@ "type": "struct", "value": "git_submodule", "file": "git2/types.h", - "line": 258, - "lineto": 258, + "line": 267, + "lineto": 267, "tdef": "typedef", "description": " Opaque structure representing a submodule.", "comments": "", @@ -37197,6 +38162,7 @@ "git_submodule_branch", "git_submodule_cb", "git_submodule_clone", + "git_submodule_dup", "git_submodule_fetch_recurse_submodules", "git_submodule_foreach", "git_submodule_free", @@ -37238,8 +38204,8 @@ ], "type": "enum", "file": "git2/types.h", - "line": 322, - "lineto": 329, + "line": 331, + "lineto": 338, "block": "GIT_SUBMODULE_IGNORE_UNSPECIFIED\nGIT_SUBMODULE_IGNORE_NONE\nGIT_SUBMODULE_IGNORE_UNTRACKED\nGIT_SUBMODULE_IGNORE_DIRTY\nGIT_SUBMODULE_IGNORE_ALL", "tdef": "typedef", "description": " Submodule ignore values", @@ -37297,8 +38263,8 @@ ], "type": "enum", "file": "git2/types.h", - "line": 341, - "lineto": 345, + "line": 350, + "lineto": 354, "block": "GIT_SUBMODULE_RECURSE_NO\nGIT_SUBMODULE_RECURSE_YES\nGIT_SUBMODULE_RECURSE_ONDEMAND", "tdef": "typedef", "description": " Options for submodule recurse.", @@ -37514,8 +38480,8 @@ ], "type": "enum", "file": "git2/types.h", - "line": 286, - "lineto": 293, + "line": 295, + "lineto": 302, "block": "GIT_SUBMODULE_UPDATE_CHECKOUT\nGIT_SUBMODULE_UPDATE_REBASE\nGIT_SUBMODULE_UPDATE_MERGE\nGIT_SUBMODULE_UPDATE_NONE\nGIT_SUBMODULE_UPDATE_DEFAULT", "tdef": "typedef", "description": " Submodule update values", @@ -37569,8 +38535,8 @@ "type": "struct", "value": "git_tag", "file": "git2/types.h", - "line": 121, - "lineto": 121, + "line": 130, + "lineto": 130, "tdef": "typedef", "description": " Parsed representation of a tag object. ", "comments": "", @@ -37606,8 +38572,8 @@ "type": "struct", "value": "git_time", "file": "git2/types.h", - "line": 166, - "lineto": 170, + "line": 175, + "lineto": 179, "block": "git_time_t time\nint offset\nchar sign", "tdef": "typedef", "description": " Time in a signature ", @@ -37719,8 +38685,8 @@ "type": "struct", "value": "git_transaction", "file": "git2/types.h", - "line": 186, - "lineto": 186, + "line": 195, + "lineto": 195, "tdef": "typedef", "description": " Transactional interface to references ", "comments": "", @@ -37747,8 +38713,8 @@ "type": "struct", "value": "git_transport", "file": "git2/types.h", - "line": 238, - "lineto": 238, + "line": 247, + "lineto": 247, "tdef": "typedef", "description": " Interface which represents a transport to communicate with a\n remote.", "comments": "", @@ -37767,8 +38733,8 @@ "type": "struct", "value": "git_tree", "file": "git2/types.h", - "line": 133, - "lineto": 133, + "line": 142, + "lineto": 142, "tdef": "typedef", "description": " Representation of a tree object. ", "comments": "", @@ -37784,6 +38750,7 @@ "git_commit_amend", "git_commit_create", "git_commit_create_buffer", + "git_commit_create_cb", "git_commit_create_v", "git_commit_tree", "git_diff_tree_to_index", @@ -37838,8 +38805,8 @@ "type": "struct", "value": "git_tree_entry", "file": "git2/types.h", - "line": 130, - "lineto": 130, + "line": 139, + "lineto": 139, "tdef": "typedef", "description": " Representation of each one of the entries in a tree object. ", "comments": "", @@ -37880,8 +38847,8 @@ "type": "struct", "value": "git_tree_update", "file": "git2/tree.h", - "line": 436, - "lineto": 445, + "line": 437, + "lineto": 446, "block": "git_tree_update_t action\ngit_oid id\ngit_filemode_t filemode\nconst char * path", "tdef": "typedef", "description": " An action to perform during the update of a tree", @@ -37925,8 +38892,8 @@ ], "type": "enum", "file": "git2/tree.h", - "line": 426, - "lineto": 431, + "line": 427, + "lineto": 432, "block": "GIT_TREE_UPDATE_UPSERT\nGIT_TREE_UPDATE_REMOVE", "tdef": "typedef", "description": " The kind of update to perform", @@ -37958,8 +38925,8 @@ "type": "struct", "value": "git_treebuilder", "file": "git2/types.h", - "line": 136, - "lineto": 136, + "line": 145, + "lineto": 145, "tdef": "typedef", "description": " Constructor for in-memory trees ", "comments": "", @@ -37989,8 +38956,8 @@ ], "type": "enum", "file": "git2/tree.h", - "line": 386, - "lineto": 389, + "line": 387, + "lineto": 390, "block": "GIT_TREEWALK_PRE\nGIT_TREEWALK_POST", "tdef": "typedef", "description": " Tree traversal modes ", @@ -38024,8 +38991,8 @@ "type": "struct", "value": "git_worktree", "file": "git2/types.h", - "line": 112, - "lineto": 112, + "line": 121, + "lineto": 121, "tdef": "typedef", "description": " Representation of a working tree ", "comments": "", @@ -38105,7 +39072,7 @@ "value": "git_worktree_prune_options", "file": "git2/worktree.h", "line": 198, - "lineto": 202, + "lineto": 203, "block": "unsigned int version\nuint32_t flags", "tdef": "typedef", "description": " Worktree prune options structure", @@ -38119,7 +39086,7 @@ { "type": "uint32_t", "name": "flags", - "comments": "" + "comments": " A combination of `git_worktree_prune_t` " } ], "used": { @@ -38185,8 +39152,8 @@ "type": "struct", "value": "git_writestream", "file": "git2/types.h", - "line": 350, - "lineto": 354, + "line": 359, + "lineto": 363, "tdef": null, "description": " A type to write in a streaming fashion, for example, for filters. ", "comments": "", @@ -38214,6 +39181,7 @@ "git_blob_create_from_stream", "git_blob_create_from_stream_commit", "git_filter_list_stream_blob", + "git_filter_list_stream_buffer", "git_filter_list_stream_data", "git_filter_list_stream_file" ] @@ -38248,8 +39216,11 @@ "git_attr_add_macro", "git_attr_cache_flush", "git_attr_foreach", + "git_attr_foreach_ext", "git_attr_get", + "git_attr_get_ext", "git_attr_get_many", + "git_attr_get_many_ext", "git_attr_value" ] ], @@ -38306,6 +39277,7 @@ "git_branch_remote_name", "git_branch_set_upstream", "git_branch_upstream", + "git_branch_upstream_merge", "git_branch_upstream_name", "git_branch_upstream_remote" ] @@ -38515,12 +39487,15 @@ "filter", [ "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_buffer", "git_filter_list_apply_to_data", "git_filter_list_apply_to_file", "git_filter_list_contains", "git_filter_list_free", "git_filter_list_load", + "git_filter_list_load_ext", "git_filter_list_stream_blob", + "git_filter_list_stream_buffer", "git_filter_list_stream_data", "git_filter_list_stream_file" ] @@ -38538,7 +39513,8 @@ "graph", [ "git_graph_ahead_behind", - "git_graph_descendant_of" + "git_graph_descendant_of", + "git_graph_reachable_from_any" ] ], [ @@ -38732,11 +39708,13 @@ "git_odb_read_header", "git_odb_read_prefix", "git_odb_refresh", + "git_odb_set_commit_graph", "git_odb_stream_finalize_write", "git_odb_stream_free", "git_odb_stream_read", "git_odb_stream_write", "git_odb_write", + "git_odb_write_multi_pack_index", "git_odb_write_pack" ] ], @@ -38768,6 +39746,7 @@ [ "oidarray", [ + "git_oidarray_dispose", "git_oidarray_free" ] ], @@ -38991,6 +39970,8 @@ "git_remote_refspec_count", "git_remote_rename", "git_remote_set_autotag", + "git_remote_set_instance_pushurl", + "git_remote_set_instance_url", "git_remote_set_pushurl", "git_remote_set_url", "git_remote_stats", @@ -39147,6 +40128,7 @@ "git_submodule_add_to_index", "git_submodule_branch", "git_submodule_clone", + "git_submodule_dup", "git_submodule_fetch_recurse_submodules", "git_submodule_foreach", "git_submodule_free", @@ -39289,119 +40271,119 @@ "examples": [ [ "add.c", - "ex/HEAD/add.html" + "ex/v1.3.0/add.html" ], [ "args.c", - "ex/HEAD/args.html" + "ex/v1.3.0/args.html" ], [ "blame.c", - "ex/HEAD/blame.html" + "ex/v1.3.0/blame.html" ], [ "cat-file.c", - "ex/HEAD/cat-file.html" + "ex/v1.3.0/cat-file.html" ], [ "checkout.c", - "ex/HEAD/checkout.html" + "ex/v1.3.0/checkout.html" ], [ "clone.c", - "ex/HEAD/clone.html" + "ex/v1.3.0/clone.html" ], [ "commit.c", - "ex/HEAD/commit.html" + "ex/v1.3.0/commit.html" ], [ "common.c", - "ex/HEAD/common.html" + "ex/v1.3.0/common.html" ], [ "config.c", - "ex/HEAD/config.html" + "ex/v1.3.0/config.html" ], [ "describe.c", - "ex/HEAD/describe.html" + "ex/v1.3.0/describe.html" ], [ "diff.c", - "ex/HEAD/diff.html" + "ex/v1.3.0/diff.html" ], [ "fetch.c", - "ex/HEAD/fetch.html" + "ex/v1.3.0/fetch.html" ], [ "for-each-ref.c", - "ex/HEAD/for-each-ref.html" + "ex/v1.3.0/for-each-ref.html" ], [ "general.c", - "ex/HEAD/general.html" + "ex/v1.3.0/general.html" ], [ "index-pack.c", - "ex/HEAD/index-pack.html" + "ex/v1.3.0/index-pack.html" ], [ "init.c", - "ex/HEAD/init.html" + "ex/v1.3.0/init.html" ], [ "lg2.c", - "ex/HEAD/lg2.html" + "ex/v1.3.0/lg2.html" ], [ "log.c", - "ex/HEAD/log.html" + "ex/v1.3.0/log.html" ], [ "ls-files.c", - "ex/HEAD/ls-files.html" + "ex/v1.3.0/ls-files.html" ], [ "ls-remote.c", - "ex/HEAD/ls-remote.html" + "ex/v1.3.0/ls-remote.html" ], [ "merge.c", - "ex/HEAD/merge.html" + "ex/v1.3.0/merge.html" ], [ "push.c", - "ex/HEAD/push.html" + "ex/v1.3.0/push.html" ], [ "remote.c", - "ex/HEAD/remote.html" + "ex/v1.3.0/remote.html" ], [ "rev-list.c", - "ex/HEAD/rev-list.html" + "ex/v1.3.0/rev-list.html" ], [ "rev-parse.c", - "ex/HEAD/rev-parse.html" + "ex/v1.3.0/rev-parse.html" ], [ "show-index.c", - "ex/HEAD/show-index.html" + "ex/v1.3.0/show-index.html" ], [ "stash.c", - "ex/HEAD/stash.html" + "ex/v1.3.0/stash.html" ], [ "status.c", - "ex/HEAD/status.html" + "ex/v1.3.0/status.html" ], [ "tag.c", - "ex/HEAD/tag.html" + "ex/v1.3.0/tag.html" ] ] -} +} \ No newline at end of file diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json index 7ecec06c9..26995b0d5 100644 --- a/generate/input/libgit2-supplement.json +++ b/generate/input/libgit2-supplement.json @@ -1104,7 +1104,7 @@ [ "git_apply_options", { - "type": "sctruct", + "type": "struct", "fields": [ { "type": "unsigned int", @@ -1454,53 +1454,6 @@ "type": "enum" } ], - [ - "git_rebase_options", - { - "type": "struct", - "fields": [ - { - "type": "unsigned int", - "name": "version" - }, - { - "type": "int", - "name": "quiet" - }, - { - "type": "const char *", - "name": "rewrite_notes_ref" - }, - { - "type": "git_checkout_options", - "name": "checkout_options" - }, - { - "type": "git_merge_options", - "name": "merge_options" - }, - { - "type": "git_commit_signing_cb", - "name": "signing_cb" - }, - { - "type": "void *", - "name": "payload" - }, - { - "type": "int", - "name": "inmemory" - } - ], - "used": { - "needs": [ - "git_rebase_init_options", - "git_checkout_init_options", - "git_merge_init_options" - ] - } - } - ], [ "git_remote_autotag_option_t", { diff --git a/generate/scripts/utils.js b/generate/scripts/utils.js index 90a96f23e..c6e843134 100644 --- a/generate/scripts/utils.js +++ b/generate/scripts/utils.js @@ -9,7 +9,7 @@ const path = require("path"); var local = path.join.bind(null, __dirname, "../"); var util = { - arrayTypeRegex: /\s\[\d+\]\s*/, + arrayTypeRegex: /\[\d*\]\s*/, pointerRegex: /\s*\*\s*/, doublePointerRegex: /\s*\*\*\s*/, diff --git a/generate/templates/manual/libgit2/opts.cc b/generate/templates/manual/libgit2/opts.cc index 3e7f1483d..d6ed362c4 100644 --- a/generate/templates/manual/libgit2/opts.cc +++ b/generate/templates/manual/libgit2/opts.cc @@ -23,15 +23,6 @@ NAN_METHOD(GitLibgit2::Opts) to = Nan::New(option_value); break; } - // GET bool - case GIT_OPT_GET_WINDOWS_LONGPATHS: { - int option_value; - if (git_libgit2_opts(from_option, &option_value)) { - return Nan::ThrowError("git_libgit2_opts failed"); - } - to = option_value ? Nan::True() : Nan::False(); - break; - } // GET unsigned long case GIT_OPT_GET_WINDOWS_SHAREMODE: { unsigned long option_value; @@ -94,21 +85,6 @@ NAN_METHOD(GitLibgit2::Opts) } break; } - // SET bool - case GIT_OPT_SET_WINDOWS_LONGPATHS: { - int option_arg; - if (info.Length() < 2) { - option_arg = 0; - } else { - const Nan::Maybe maybeIsTruthy = Nan::To(info[1]); - const bool isTruthy = maybeIsTruthy.IsJust() && maybeIsTruthy.FromJust(); - option_arg = isTruthy ? 1 : 0; - } - if (git_libgit2_opts(from_option, option_arg)) { - return Nan::ThrowError("git_libgit2_opts failed"); - } - break; - } // SET size_t case GIT_OPT_SET_MWINDOW_SIZE: case GIT_OPT_SET_MWINDOW_MAPPED_LIMIT: diff --git a/generate/templates/manual/src/convenient_hunk.cc b/generate/templates/manual/src/convenient_hunk.cc index e1ba23343..38dd8c078 100644 --- a/generate/templates/manual/src/convenient_hunk.cc +++ b/generate/templates/manual/src/convenient_hunk.cc @@ -69,9 +69,9 @@ NAN_METHOD(ConvenientHunk::JSNewFunction) { info.GetReturnValue().Set(info.This()); } -Local ConvenientHunk::New(void *raw) { +Local ConvenientHunk::New(void *raw) { Nan::EscapableHandleScope scope; - Local argv[1] = { Nan::New((void *)raw) }; + Local argv[1] = { Nan::New((void *)raw) }; nodegit::Context *nodegitContext = nodegit::Context::GetCurrentContext(); Local constructor_template = nodegitContext->GetFromPersistent("ConvenientHunk::Template").As(); return scope.Escape(Nan::NewInstance(constructor_template, 1, argv).ToLocalChecked()); diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc index 36e20891c..5050350e4 100644 --- a/generate/templates/partials/callback_helpers.cc +++ b/generate/templates/partials/callback_helpers.cc @@ -36,7 +36,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_async(void {% endif %} {% endeach %} - v8::Local argv[{{ cbFunction.args|callbackArgsCount }}] = { + v8::Local argv[{{ cbFunction.args|callbackArgsCount }}] = { {% each cbFunction.args|callbackArgsInfo as arg %} {% if not arg.firstArg %}, {% endif %} {% if arg.isEnum %} diff --git a/generate/templates/partials/configurable_callbacks.cc b/generate/templates/partials/configurable_callbacks.cc index 3b2866074..79eef554b 100644 --- a/generate/templates/partials/configurable_callbacks.cc +++ b/generate/templates/partials/configurable_callbacks.cc @@ -84,14 +84,25 @@ return; } + {% each field.args|callbackArgsInfo as arg %} + {% if arg.cppClassName == "Array" %} + v8::Local _{{arg.name}}_array = Nan::New(baton->{{ arg.arrayLengthArgumentName }}); + for(uint32_t i = 0; i < _{{arg.name}}_array->Length(); i++) { + Nan::Set(_{{arg.name}}_array, i, {{arg.arrayElementCppClassName}}::New(baton->{{arg.name}}[i], false)); + } + {% endif %} + {% endeach %} + {% if field.args|callbackArgsCount == 0 %} - v8::Local *argv = NULL; + v8::Local *argv = NULL; {% else %} - v8::Local argv[{{ field.args|callbackArgsCount }}] = { + v8::Local argv[{{ field.args|callbackArgsCount }}] = { {% each field.args|callbackArgsInfo as arg %} {% if not arg.firstArg %},{% endif %} {% if arg.isEnum %} Nan::New((int)baton->{{ arg.name }}) + {% elsif arg.cppClassName == "Array" %} + _{{arg.name}}_array {% elsif arg.isLibgitType %} {{ arg.cppClassName }}::New(baton->{{ arg.name }}, false) {% elsif arg.cType == "size_t" %} @@ -133,18 +144,22 @@ } else if (!result->IsNull() && !result->IsUndefined()) { {% if _return.isOutParam %} - {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(Nan::To(result).ToLocalChecked()); - wrapper->selfFreeing = false; + {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(Nan::To(result).ToLocalChecked()); + wrapper->selfFreeing = false; - *baton->{{ _return.name }} = wrapper->GetValue(); - baton->result = {{ field.return.success }}; + {% if _return.cppClassName == "GitOid" %} + git_oid_cpy(baton->{{ _return.name }}, wrapper->GetValue()); + {% else %} + *baton->{{ _return.name }} = wrapper->GetValue(); + {% endif %} + baton->result = {{ field.return.success }}; {% else %} - if (result->IsNumber()) { - baton->result = Nan::To(result).FromJust(); - } - else { - baton->result = baton->defaultResult; - } + if (result->IsNumber()) { + baton->result = Nan::To(result).FromJust(); + } + else { + baton->result = baton->defaultResult; + } {% endif %} } else { @@ -169,18 +184,22 @@ } else if (!result->IsNull() && !result->IsUndefined()) { {% if _return.isOutParam %} - {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(Nan::To(result).ToLocalChecked()); - wrapper->selfFreeing = false; - - *baton->{{ _return.name }} = wrapper->GetValue(); - baton->result = {{ field.return.success }}; + {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(Nan::To(result).ToLocalChecked()); + wrapper->selfFreeing = false; + + {% if _return.cppClassName == "GitOid" %} + git_oid_cpy(baton->{{ _return.name }}, wrapper->GetValue()); + {% else %} + *baton->{{ _return.name }} = wrapper->GetValue(); + {% endif %} + baton->result = {{ field.return.success }}; {% else %} - if (result->IsNumber()) { - baton->result = Nan::To(result).FromJust(); - } - else{ - baton->result = baton->defaultResult; - } + if (result->IsNumber()) { + baton->result = Nan::To(result).FromJust(); + } + else { + baton->result = baton->defaultResult; + } {% endif %} } else { diff --git a/generate/templates/partials/convert_from_v8.cc b/generate/templates/partials/convert_from_v8.cc index 01462281f..8b928e7f4 100644 --- a/generate/templates/partials/convert_from_v8.cc +++ b/generate/templates/partials/convert_from_v8.cc @@ -49,12 +49,31 @@ v8::Local tmp_{{ name }} = v8::Local::Cast(info[{{ jsArg }}]); from_{{ name }} = ({{ cType }})malloc(tmp_{{ name }}->Length() * sizeof({{ cType|unPointer }})); - for (unsigned int i = 0; i < tmp_{{ name }}->Length(); i++) { + for (unsigned int i = 0; i < tmp_{{ name }}->Length(); i++) { {%-- // FIXME: should recursively call convertFromv8. --%} - from_{{ name }}[i] = {%if not cType|isDoublePointer %}*{%endif%}Nan::ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(Nan::To(Nan::Get(tmp_{{ name }}, Nan::New(static_cast(i))).ToLocalChecked()).ToLocalChecked())->GetValue(); + const v8::Local arrayVal = Nan::Get(tmp_{{ name }},i).ToLocalChecked(); + {%if arrayElementCppClassName == 'GitOid'%} + if (arrayVal->IsString()) { + // Try and parse in a string to a git_oid + Nan::Utf8String oidString(Nan::To(arrayVal).ToLocalChecked()); + + if (git_oid_fromstr(&from_{{ name }}[i], (const char *) strdup(*oidString)) != GIT_OK) { + if (git_error_last()) { + return Nan::ThrowError(git_error_last()->message); + } else { + return Nan::ThrowError("Unknown Error"); + } + } + } + else { + git_oid_cpy(&from_{{ name }}[i], Nan::ObjectWrap::Unwrap(Nan::To(arrayVal).ToLocalChecked())->GetValue()); } + {%else%} + from_{{ name }}[i] = Nan::ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(Nan::To(arrayVal).ToLocalChecked())->GetValue(); + {%endif%} + } {%elsif cppClassName == 'Function'%} {%elsif cppClassName == 'Buffer'%} diff --git a/lib/buf.js b/lib/buf.js index 28f34c2a3..aec6ba693 100644 --- a/lib/buf.js +++ b/lib/buf.js @@ -1,11 +1,43 @@ -const { Buf } = require("../"); +var util = require("util"); +var NodeGit = require("../"); +var Buf = NodeGit.Buf; + +var _set = Buf.prototype.set; +var _grow = Buf.prototype.grow; +var _isBinary = Buf.prototype.isBinary; +var _containsNul = Buf.prototype.containsNul; /** * Sets the content of a GitBuf to a string. * @param {string} The utf8 value to set in the buffer. * The string will be null terminated. */ -Buf.prototype.setString = function(content) { +var _setString = function(content) { const buf = Buffer.from(content + "\0", "utf8"); this.set(buf, buf.length); }; + +Buf.prototype.set = util.deprecate( + _set, + "NodeGit.Buf.prototype.set is deprecated." +); + +Buf.prototype.setString = util.deprecate( + _setString, + "NodeGit.Buf.prototype.setString is deprecated." +); + +Buf.prototype.grow = util.deprecate( + _grow, + "NodeGit.Buf.prototype.grow is deprecated." +); + +Buf.prototype.isBinary = util.deprecate( + _isBinary, + "NodeGit.Buf.prototype.isBinary is deprecated." +); + +Buf.prototype.containsNul = util.deprecate( + _containsNul, + "NodeGit.Buf.prototype.containsNul is deprecated." +); \ No newline at end of file diff --git a/lib/graph.js b/lib/graph.js new file mode 100644 index 000000000..737141007 --- /dev/null +++ b/lib/graph.js @@ -0,0 +1,15 @@ +var NodeGit = require("../"); + +var Graph = NodeGit.Graph; + +var _reachableFromAny = Graph.reachableFromAny; + +/** + * Determine if a commit is reachable from any of a list of commits by following parent edges. + * @param {repository} the repository where the commits exist + * @param {commit} a previously loaded commit + * @param {descendant_array} oids of the commits + */ +Graph.reachableFromAny = function(repository, commit, descendant_array) { + return _reachableFromAny(repository, commit, descendant_array, descendant_array.length); +}; diff --git a/lib/libgit2.js b/lib/libgit2.js deleted file mode 100644 index 40730278d..000000000 --- a/lib/libgit2.js +++ /dev/null @@ -1,6 +0,0 @@ -var NodeGit = require("../"); - -var Libgit2 = NodeGit.Libgit2; - -Libgit2.OPT.SET_WINDOWS_LONGPATHS = 31; -Libgit2.OPT.GET_WINDOWS_LONGPATHS = 32; diff --git a/lib/rebase.js b/lib/rebase.js index 92e0de95b..821d470dd 100644 --- a/lib/rebase.js +++ b/lib/rebase.js @@ -4,46 +4,36 @@ var Rebase = NodeGit.Rebase; var _init = Rebase.init; var _open = Rebase.open; -function defaultRebaseOptions(options, checkoutStrategy) { +function defaultRebaseOptions(repository, options, checkoutStrategy) { if (options) { // Ensure we don't modify the passed-in options object. - // This could lead to us recursing signingCb if the same + // This could lead to us recursing commitCreateCb if the same // options object is later re-used. options = Object.assign({}, options); - if (options.signingCb) { + if (options.signingCb && !options.commitCreateCb) { + console.warn("signingCb is deperecated, use commitCreateCb instead."); + let signingCb = options.signingCb; - options.signingCb = function ( - signatureBuf, - signatureFieldBuf, - commitContent + options.commitCreateCb = function ( + author, + committer, + message_encoding, + message, + tree, + parent_count, + parents ) { - try { - const signingCbResult = signingCb(commitContent); - - return Promise.resolve(signingCbResult) - .then(function({ code, field, signedData }) { - if (code === NodeGit.Error.CODE.OK) { - signatureBuf.setString(signedData); - if (field) { - signatureFieldBuf.setString(field); - } - } - - return code; - }) - .catch(function(error) { - if (error && error.code) { - return error.code; - } - return NodeGit.Error.CODE.ERROR; - }); - } catch (error) { - if (error && error.code) { - return error.code; - } - return NodeGit.Error.CODE.ERROR; - } + return repository.createCommitWithSignature( + null, + author, + committer, + message, + tree, + parents, + signingCb).then((oid) => { + return oid; + }); }; } } else if (checkoutStrategy) { @@ -73,6 +63,7 @@ function defaultRebaseOptions(options, checkoutStrategy) { */ Rebase.init = function(repository, branch, upstream, onto, options) { return _init(repository, branch, upstream, onto, defaultRebaseOptions( + repository, options, NodeGit.Checkout.STRATEGY.FORCE )); @@ -88,6 +79,7 @@ Rebase.init = function(repository, branch, upstream, onto, options) { */ Rebase.open = function(repository, options) { return _open(repository, defaultRebaseOptions( + repository, options, NodeGit.Checkout.STRATEGY.SAFE )); diff --git a/package.json b/package.json index c01b49664..139ba4a8b 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "lint": "jshint lib test/tests test/utils lifecycleScripts", "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && ./lcov-1.10/bin/genhtml test/coverage/merged.lcov --output-directory test/coverage/report", "mocha": "mocha --expose-gc test/runner test/tests --timeout 15000", - "mochaDebug": "mocha --expose-gc --debug-brk test/runner test/tests --timeout 15000", + "mochaDebug": "mocha --expose-gc --inspect-brk test/runner test/tests --timeout 15000", "postinstall": "node lifecycleScripts/postinstall", "rebuild": "node generate && node-gyp configure build", "rebuildDebug": "node generate && node-gyp configure --debug build", diff --git a/test/runner.js b/test/runner.js index 96629f4a5..3ca48486b 100644 --- a/test/runner.js +++ b/test/runner.js @@ -8,10 +8,36 @@ var NodeGit = require('..'); var workdirPath = local("repos/workdir"); var constWorkdirPath = local("repos/constworkdir"); +const testRepos = [ + "repos/bare", + "repos/blameRepo", + "repos/cherrypick", + "repos/clone", + "repos/constworkdir", + "repos/convenientLineTest", + "repos/empty", + "repos/index", + "repos/index", + "repos/merge", + "repos/merge-head", + "repos/new", + "repos/newrepo", + "repos/nonrepo", + "repos/rebase", + "repos/renamedFileRepo", + "repos/revertRepo", + "repos/stagingRepo", + "repos/submodule", + "repos/submodule/nodegittest/", + "repos/tree/", + "repos/workdir", +]; + before(function() { this.timeout(350000); - var url = "https://github.com/nodegit/test"; + var testUrl = "https://github.com/nodegit/test"; + var constTestUrl = "https://github.com/nodegit/test-frozen"; return fse.remove(local("repos")) .then(function() { fse.remove(local("home")) @@ -23,10 +49,17 @@ before(function() { return exec("git init " + local("repos", "empty")); }) .then(function() { - return exec("git clone " + url + " " + constWorkdirPath); + return exec("git clone " + constTestUrl + " " + constWorkdirPath); + }) + .then(function() { + return exec("git clone " + testUrl + " " + workdirPath); }) .then(function() { - return exec("git clone " + url + " " + workdirPath); + //to checkout the longpaths-checkout branch + if(process.platform === "win32") { + return exec("git config core.longpaths true", {cwd: workdirPath}); + } + return Promise.resolve(); }) .then(function() { return exec("git checkout rev-walk", {cwd: workdirPath}); @@ -34,6 +67,9 @@ before(function() { .then(function() { return exec("git checkout checkout-test", {cwd: workdirPath}); }) + .then(function() { + return exec("git checkout longpaths-checkout", {cwd: workdirPath}); + }) .then(function() { return exec("git checkout master", {cwd: workdirPath}); }) @@ -50,7 +86,13 @@ before(function() { .then(function() { return fse.writeFile(local("home", ".gitconfig"), "[user]\n name = John Doe\n email = johndoe@example.com"); - }); + }) + .then( async function() { + //mark all test repos as safe + for(let repo of testRepos) { + await exec(`git config --global --add safe.directory ${local(repo)}`); + } + }) }); beforeEach(function() { diff --git a/test/tests/checkout.js b/test/tests/checkout.js index e821016da..c10d50d3a 100644 --- a/test/tests/checkout.js +++ b/test/tests/checkout.js @@ -14,6 +14,7 @@ describe("Checkout", function() { var readMePath = local("../repos/workdir/" + readMeName); var packageJsonPath = local("../repos/workdir/" + packageJsonName); var checkoutBranchName = "checkout-test"; + var longpathBranchName = "longpaths-checkout"; beforeEach(function() { var test = this; @@ -35,6 +36,52 @@ describe("Checkout", function() { }); }); + it("can checkout a branch with a long file path", function() { + var test = this; + + return (function () { + if(process.platform === "win32") { + return test.repository.config() + .then(function(config) { + return config.setBool("core.longpaths", true); + }); + } + + return Promise.resolve(); + })() + .then(function() { + return test.repository.checkoutBranch(longpathBranchName); + }) + .then(function() { + return test.repository.getStatus(); + }) + .then(function(statuses) { + assert.equal(statuses.length, 0); + }); + }); + + it("cannot checkout long path file if core.longpaths is not set on win32", function() { + var test = this; + + if (process.platform !== "win32") { + this.skip(); + } + + return test.repository.config() + .then(function(config) { + config.setBool("core.longpaths", false); + }) + .then(function () { + return test.repository.checkoutBranch(longpathBranchName); + }) + .then(function() { + assert.fail(); + }) + .catch(function(err) { + assert(~err.message.indexOf("path too long")); + }); + }); + it("can force checkout a single file", function() { var test = this; diff --git a/test/tests/clone.js b/test/tests/clone.js index 000c2a4be..4f2b58d27 100644 --- a/test/tests/clone.js +++ b/test/tests/clone.js @@ -43,10 +43,6 @@ describe("Clone", function() { this.timeout(30000); beforeEach(function() { - if (process.platform === "win32") { - NodeGit.Libgit2.opts(NodeGit.Libgit2.OPT.SET_WINDOWS_LONGPATHS, 0); - } - return fse.remove(clonePath) .then(function() { return fse.remove(longClonePath); @@ -84,54 +80,6 @@ describe("Clone", function() { }); }); - it("can clone into long path if opt set", function() { - var test = this; - var url = "https://github.com/nodegit/test.git"; - var opts = { - fetchOpts: { - callbacks: { - certificateCheck: () => 0 - } - } - }; - - fse.ensureDirSync(longClonePath); - - if (process.platform === "win32") { - NodeGit.Libgit2.opts(NodeGit.Libgit2.OPT.SET_WINDOWS_LONGPATHS, 1); - } - - return Clone(url, longClonePath, opts).then(function(repo) { - assert.ok(repo instanceof Repository); - test.repository = repo; - }); - }); - - it("can't clone into long path if opt not set on win32", function() { - if (process.platform !== "win32") { - this.skip(); - } - - var url = "https://github.com/nodegit/test.git"; - var opts = { - fetchOpts: { - callbacks: { - certificateCheck: () => 0 - } - } - }; - - fse.ensureDirSync(longClonePath); - - NodeGit.Libgit2.opts(NodeGit.Libgit2.OPT.SET_WINDOWS_LONGPATHS, 0); - - return Clone(url, longClonePath, opts).then(function(repo) { - assert.fail("Clone should not succeed"); - }).catch(function(error) { - assert.ok(error instanceof Error); - }); - }); - it("can clone twice with https using same config object", function() { var test = this; var url = "https://github.com/nodegit/test.git"; diff --git a/test/tests/filter.js b/test/tests/filter.js index 3cb7467e8..06e138ba5 100644 --- a/test/tests/filter.js +++ b/test/tests/filter.js @@ -220,7 +220,7 @@ describe("Filter", function() { it("should apply filter when check succeeds", function() { var test = this; - var applied = true; + var applied = false; return Registry.register(filterName, { apply: function() { diff --git a/test/tests/graph.js b/test/tests/graph.js index 34805cda0..87dcfda54 100644 --- a/test/tests/graph.js +++ b/test/tests/graph.js @@ -58,7 +58,21 @@ describe("Graph", function() { "26744fc697849d370246749b67ac43b792a4af0c" ) .catch(function(result) { - assert(~result.message.indexOf("81b06fac")); + assert(~result.message.indexOf("object not found - no match for id")); + }); + }); + + it("can tell if a commit is reachable from any of a list of commits", function() { + return Graph.reachableFromAny( + this.repository, + "32789a79e71fbc9e04d3eff7425e1771eb595150", + [ + "1729c73906bb8467f4095c2f4044083016b4dfde", + "e0aeedcff0584ebe00aed2c03c8ecd10839df908" + ] + ) + .then(function(result) { + assert.equal(result, 0); }); }); }); diff --git a/test/tests/rebase.js b/test/tests/rebase.js index 89ab43515..d9aae1fbc 100644 --- a/test/tests/rebase.js +++ b/test/tests/rebase.js @@ -1874,7 +1874,7 @@ describe("Rebase", function() { }) .then(function(commitOid) { assert.equal(commitOid.toString(), - "24250fe6bd8a782ec1aaca8b2c9a2456a90517ed"); + "617cd03370dd799f372e9dcfcd0b097aede1bd7f"); // git_rebase_operation_current returns the index of the rebase // operation that was last applied, so after the first operation, it @@ -1891,13 +1891,13 @@ describe("Rebase", function() { .then(function(commit) { // verify that the "ours" branch has moved to the correct place assert.equal(commit.id().toString(), - "24250fe6bd8a782ec1aaca8b2c9a2456a90517ed"); + "617cd03370dd799f372e9dcfcd0b097aede1bd7f"); return Promise.all([ commit.parent(0), NodeGit.Commit.extractSignature( repository, - "24250fe6bd8a782ec1aaca8b2c9a2456a90517ed", + "617cd03370dd799f372e9dcfcd0b097aede1bd7f", "moose-sig" ) ]); @@ -2416,7 +2416,7 @@ describe("Rebase", function() { }); }); - + it("rebase signs correctly if rebaseOptions are re-used", function () { const ourFileName = "ourNewFile.txt"; const theirFileName = "theirNewFile.txt"; @@ -2434,7 +2434,7 @@ describe("Rebase", function() { let rebase; let newCommitOid; - + const rebaseOptions = { signingCb: () => ({ code: NodeGit.Error.CODE.OK, @@ -2442,7 +2442,7 @@ describe("Rebase", function() { signedData: "A moose was here." }) }; - + const repository = this.repository; // Create two commits on master @@ -2521,7 +2521,7 @@ describe("Rebase", function() { .then((_newCommitOid) => { newCommitOid = _newCommitOid; assert.strictEqual(newCommitOid.toString(), - "89ad8168264267bcc50ee60ade3bc3804f55aa72"); + "9909e435b52322a71dc341d747b29c392a34c745"); return rebase.next(); }) .then(() => { diff --git a/vendor/libgit2 b/vendor/libgit2 index a807e37df..30d5c088a 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit a807e37df4ca3f60df7e9675e3c8049a21dd6283 +Subproject commit 30d5c088a45b29ac819aac890d70ed0ca5f7b194 diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 270e2b39c..05e29d7fc 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -74,8 +74,6 @@ "libgit2/src/blob.h", "libgit2/src/branch.c", "libgit2/src/branch.h", - "libgit2/src/buf_text.c", - "libgit2/src/buf_text.h", "libgit2/src/buffer.c", "libgit2/src/buffer.h", "libgit2/src/cache.c", @@ -122,6 +120,8 @@ "libgit2/src/diff.h", "libgit2/src/errors.c", "libgit2/src/errors.h", + "libgit2/src/email.c", + "libgit2/src/email.h", "libgit2/src/fetch.c", "libgit2/src/fetch.h", "libgit2/src/fetchhead.c", @@ -248,6 +248,8 @@ "libgit2/src/signature.h", "libgit2/src/streams/socket.c", "libgit2/src/streams/socket.h", + "libgit2/src/streams/openssl_legacy.c", + "libgit2/src/streams/openssl_legacy.h", "libgit2/src/sortedcache.c", "libgit2/src/sortedcache.h", "libgit2/src/stash.c", @@ -297,6 +299,8 @@ "libgit2/src/userdiff.h", "libgit2/src/util.c", "libgit2/src/util.h", + "libgit2/src/utf8.c", + "libgit2/src/utf8.h", "libgit2/src/varint.c", "libgit2/src/varint.h", "libgit2/src/vector.c", @@ -674,6 +678,9 @@ "libgit2/deps/ntlmclient/util.c", "libgit2/deps/ntlmclient/util.h" ], + "defines": [ + "UNICODE_BUILTIN" + ], "conditions": [ ["OS=='mac' and <(is_electron) == 1", { "include_dirs": ["<(electron_openssl_root)/include"]