diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/branch.h | 6 | ||||
| -rw-r--r-- | include/git2/clone.h | 6 | ||||
| -rw-r--r-- | include/git2/rebase.h | 7 | ||||
| -rw-r--r-- | include/git2/refs.h | 48 | ||||
| -rw-r--r-- | include/git2/remote.h | 7 | ||||
| -rw-r--r-- | include/git2/repository.h | 31 | ||||
| -rw-r--r-- | include/git2/reset.h | 2 | ||||
| -rw-r--r-- | include/git2/submodule.h | 6 |
8 files changed, 46 insertions, 67 deletions
diff --git a/include/git2/branch.h b/include/git2/branch.h index 43aa20f77..e45a36453 100644 --- a/include/git2/branch.h +++ b/include/git2/branch.h @@ -43,8 +43,6 @@ GIT_BEGIN_DECL * * @param force Overwrite existing branch. * - * @param signature The identity that will used to populate the reflog entry - * * @param log_message The one line long message to be appended to the reflog. * If NULL, the default is "Branch: created"; if you want something more * useful, provide a message. @@ -59,7 +57,6 @@ GIT_EXTERN(int) git_branch_create( const char *branch_name, const git_commit *target, int force, - const git_signature *signature, const char *log_message); /** @@ -123,8 +120,6 @@ GIT_EXTERN(void) git_branch_iterator_free(git_branch_iterator *iter); * * @param force Overwrite existing branch. * - * @param signature The identity that will used to populate the reflog entry - * * @param log_message The one line long message to be appended to the reflog * * @return 0 on success, GIT_EINVALIDSPEC or an error code. @@ -134,7 +129,6 @@ GIT_EXTERN(int) git_branch_move( git_reference *branch, const char *new_branch_name, int force, - const git_signature *signature, const char *log_message); /** diff --git a/include/git2/clone.h b/include/git2/clone.h index 1cee516a1..d3bd42485 100644 --- a/include/git2/clone.h +++ b/include/git2/clone.h @@ -137,12 +137,6 @@ typedef struct git_clone_options { const char* checkout_branch; /** - * The identity used when updating the reflog. NULL means to - * use the default signature using the config. - */ - git_signature *signature; - - /** * A callback used to create the new repository into which to * clone. If NULL, the 'bare' field will be used to determine * whether to create a bare repository. diff --git a/include/git2/rebase.h b/include/git2/rebase.h index 19f5cb8c9..58b66b7fa 100644 --- a/include/git2/rebase.h +++ b/include/git2/rebase.h @@ -139,7 +139,6 @@ GIT_EXTERN(int) git_rebase_init_options( * reachable commits * @param onto The branch to rebase onto, or NULL to rebase onto the given * upstream - * @param signature The signature of the rebaser (optional) * @param opts Options to specify how rebase is performed * @return Zero on success; -1 on failure. */ @@ -149,7 +148,6 @@ GIT_EXTERN(int) git_rebase_init( const git_annotated_commit *branch, const git_annotated_commit *upstream, const git_annotated_commit *onto, - const git_signature *signature, const git_rebase_options *opts); /** @@ -241,13 +239,10 @@ GIT_EXTERN(int) git_rebase_commit( * and working directory to their state before rebase began. * * @param rebase The rebase that is in-progress - * @param signature The identity that is aborting the rebase * @return Zero on success; GIT_ENOTFOUND if a rebase is not in progress, * -1 on other errors. */ -GIT_EXTERN(int) git_rebase_abort( - git_rebase *rebase, - const git_signature *signature); +GIT_EXTERN(int) git_rebase_abort(git_rebase *rebase); /** * Finishes a rebase that is currently in progress once all patches have diff --git a/include/git2/refs.h b/include/git2/refs.h index 43dda7ca4..db84ed03a 100644 --- a/include/git2/refs.h +++ b/include/git2/refs.h @@ -89,9 +89,9 @@ GIT_EXTERN(int) git_reference_dwim(git_reference **out, git_repository *repo, co * 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. * - * The signature and 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. + * 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. * * It will return GIT_EMODIFIED if the reference's value at the time * of updating does not match the one passed through `current_value` @@ -103,11 +103,10 @@ GIT_EXTERN(int) git_reference_dwim(git_reference **out, git_repository *repo, co * @param target The target of the reference * @param force Overwrite existing references * @param current_value The expected value of the reference when updating - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code */ -GIT_EXTERN(int) git_reference_symbolic_create_matching(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *current_value, const git_signature *signature, const char *log_message); +GIT_EXTERN(int) git_reference_symbolic_create_matching(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *current_value, const char *log_message); /** * Create a new symbolic reference. @@ -131,20 +130,19 @@ GIT_EXTERN(int) git_reference_symbolic_create_matching(git_reference **out, git_ * 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. * - * The signature and 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. + * 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. * * @param out Pointer to the newly created reference * @param repo Repository where that reference will live * @param name The name of the reference * @param target The target of the reference * @param force Overwrite existing references - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code */ -GIT_EXTERN(int) git_reference_symbolic_create(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const git_signature *signature, const char *log_message); +GIT_EXTERN(int) git_reference_symbolic_create(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *log_message); /** * Create a new direct reference. @@ -169,20 +167,19 @@ GIT_EXTERN(int) git_reference_symbolic_create(git_reference **out, git_repositor * 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. * - * The signature and message for the reflog will be ignored if the - * reference does not belong in the standard set (HEAD, branches and - * remote-tracking branches) and and it does not have a reflog. + * 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 and it does not have a reflog. * * @param out Pointer to the newly created reference * @param repo Repository where that reference will live * @param name The name of the reference * @param id The object id pointed to by the reference. * @param force Overwrite existing references - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code */ -GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_signature *signature, const char *log_message); +GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const char *log_message); /** * Conditionally create new direct reference @@ -207,9 +204,9 @@ GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo, * 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. * - * The signature and message for the reflog will be ignored if the - * reference does not belong in the standard set (HEAD, branches and - * remote-tracking branches) and and it does not have a reflog. + * 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 and it does not have a reflog. * * It will return GIT_EMODIFIED if the reference's value at the time * of updating does not match the one passed through `current_id` @@ -221,12 +218,11 @@ GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo, * @param id The object id pointed to by the reference. * @param force Overwrite existing references * @param current_id The expected value of the reference at the time of update - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EMODIFIED if the value of the reference * has changed, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code */ -GIT_EXTERN(int) git_reference_create_matching(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_oid *current_id, const git_signature *signature, const char *log_message); +GIT_EXTERN(int) git_reference_create_matching(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_oid *current_id, const char *log_message); /** * Get the OID pointed to by a direct reference. @@ -320,14 +316,13 @@ GIT_EXTERN(git_repository *) git_reference_owner(const git_reference *ref); * The target name will be checked for validity. * See `git_reference_symbolic_create()` for rules about valid names. * - * The signature and message for the reflog will be ignored if the - * reference does not belong in the standard set (HEAD, branches and - * remote-tracking branches) and and it does not have a reflog. + * 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 and it does not have a reflog. * * @param out Pointer to the newly created reference * @param ref The reference * @param target The new target for the reference - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EINVALIDSPEC or an error code */ @@ -335,7 +330,6 @@ GIT_EXTERN(int) git_reference_symbolic_set_target( git_reference **out, git_reference *ref, const char *target, - const git_signature *signature, const char *log_message); /** @@ -348,7 +342,6 @@ GIT_EXTERN(int) git_reference_symbolic_set_target( * @param out Pointer to the newly created reference * @param ref The reference * @param id The new target OID for the reference - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EMODIFIED if the value of the reference * has changed since it was read, or an error code @@ -357,7 +350,6 @@ GIT_EXTERN(int) git_reference_set_target( git_reference **out, git_reference *ref, const git_oid *id, - const git_signature *signature, const char *log_message); /** @@ -379,7 +371,6 @@ GIT_EXTERN(int) git_reference_set_target( * @param ref The reference to rename * @param new_name The new name for the reference * @param force Overwrite an existing reference - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code * @@ -389,7 +380,6 @@ GIT_EXTERN(int) git_reference_rename( git_reference *ref, const char *new_name, int force, - const git_signature *signature, const char *log_message); /** diff --git a/include/git2/remote.h b/include/git2/remote.h index 2bfc35f4b..c7411cc3b 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -376,7 +376,6 @@ GIT_EXTERN(void) git_remote_free(git_remote *remote); * Update the tips to the new state * * @param remote the remote to update - * @param signature The identity to use when updating reflogs * @param reflog_message The message to insert into the reflogs. If NULL, the * default is "fetch <name>", where <name> is the name of * the remote (or its url, for in-memory remotes). @@ -384,7 +383,6 @@ GIT_EXTERN(void) git_remote_free(git_remote *remote); */ GIT_EXTERN(int) git_remote_update_tips( git_remote *remote, - const git_signature *signature, const char *reflog_message); /** @@ -404,7 +402,6 @@ GIT_EXTERN(int) git_remote_prune(git_remote *remote); * @param remote the remote to fetch from * @param refspecs the refspecs to use for this fetch. Pass NULL or an * empty array to use the base refspecs. - * @param signature The identity to use when updating reflogs * @param reflog_message The message to insert into the reflogs. If NULL, the * default is "fetch" * @return 0 or an error code @@ -412,7 +409,6 @@ GIT_EXTERN(int) git_remote_prune(git_remote *remote); GIT_EXTERN(int) git_remote_fetch( git_remote *remote, const git_strarray *refspecs, - const git_signature *signature, const char *reflog_message); /** @@ -424,13 +420,12 @@ GIT_EXTERN(int) git_remote_fetch( * @param refspecs the refspecs to use for pushing. If none are * passed, the configured refspecs will be used * @param opts the options - * @param signature signature to use for the reflog of updated references * @param reflog_message message to use for the reflog of upated references */ GIT_EXTERN(int) git_remote_push(git_remote *remote, const git_strarray *refspecs, const git_push_options *opts, - const git_signature *signature, const char *reflog_message); + const char *reflog_message); /** * Get a list of the configured remotes for a repo diff --git a/include/git2/repository.h b/include/git2/repository.h index 2fb381316..a08dfcc28 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -603,14 +603,12 @@ GIT_EXTERN(int) git_repository_hashfile( * * @param repo Repository pointer * @param refname Canonical name of the reference the HEAD should point at - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, or an error code */ GIT_EXTERN(int) git_repository_set_head( git_repository* repo, const char* refname, - const git_signature *signature, const char *log_message); /** @@ -627,14 +625,12 @@ GIT_EXTERN(int) git_repository_set_head( * * @param repo Repository pointer * @param commitish Object id of the Commit the HEAD should point to - * @param signature The identity that will used to populate the reflog entry * @param log_message The one line long message to be appended to the reflog * @return 0 on success, or an error code */ GIT_EXTERN(int) git_repository_set_head_detached( git_repository* repo, const git_oid* commitish, - const git_signature *signature, const char *log_message); /** @@ -651,14 +647,12 @@ GIT_EXTERN(int) git_repository_set_head_detached( * Otherwise, the HEAD will be detached and point to the peeled Commit. * * @param repo Repository pointer - * @param signature The identity that will used to populate the reflog entry * @param reflog_message The one line long message to be appended to the reflog * @return 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing * branch or an error code */ GIT_EXTERN(int) git_repository_detach_head( git_repository* repo, - const git_signature *signature, const char *reflog_message); /** @@ -720,6 +714,31 @@ GIT_EXTERN(const char *) git_repository_get_namespace(git_repository *repo); */ GIT_EXTERN(int) git_repository_is_shallow(git_repository *repo); +/** + * Retrieve the configured identity to use for reflogs + * + * The memory is owned by the repository and must not be freed by the + * user. + * + * @param name where to store the pointer to the name + * @param email where to store the pointer to the email + * @param repo the repository + */ +GIT_EXTERN(int) git_repository_ident(const char **name, const char **email, const git_repository *repo); + +/** + * Set the identity to be used for writing reflogs + * + * If both are set, this name and email will be used to write to the + * reflog. Pass NULL to unset. When unset, the identity will be taken + * from the repository's configuration. + * + * @param repo the repository to configure + * @param name the name to use for the reflog entries + * @param name the email to use for the reflog entries + */ +GIT_EXTERN(int) git_repository_set_ident(git_repository *repo, const char *name, const char *email); + /** @} */ GIT_END_DECL #endif diff --git a/include/git2/reset.h b/include/git2/reset.h index 53f3e891e..4a3407791 100644 --- a/include/git2/reset.h +++ b/include/git2/reset.h @@ -56,7 +56,6 @@ typedef enum { * The checkout_strategy field will be overridden (based on reset_type). * This parameter can be used to propagate notify and progress callbacks. * - * @param signature The identity that will used to populate the reflog entry * * @param log_message The one line long message to be appended to the reflog. * The reflog is only updated if the affected direct reference is actually @@ -70,7 +69,6 @@ GIT_EXTERN(int) git_reset( git_object *target, git_reset_t reset_type, git_checkout_options *checkout_opts, - const git_signature *signature, const char *log_message); /** diff --git a/include/git2/submodule.h b/include/git2/submodule.h index 1c139d0a7..245b2a2c1 100644 --- a/include/git2/submodule.h +++ b/include/git2/submodule.h @@ -141,12 +141,6 @@ typedef struct git_submodule_update_options { * in the working directory for the newly cloned repository. */ unsigned int clone_checkout_strategy; - - /** - * The identity used when updating the reflog. NULL means to - * use the default signature using the config. - */ - git_signature *signature; } git_submodule_update_options; #define GIT_SUBMODULE_UPDATE_OPTIONS_VERSION 1 |