proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 18:38:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refs: conditional wording fixups

Browse Source 
This addresses arrbee's concerns about wording in the conditional
reference udpate functions.
This commit is contained in:
Carlos Martín Nieto 2014-02-10 14:38:01 +01:00
parent fb52ba19ff
commit 77ad675464
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/git2/refs.h
View File

@ -93,8 +93,9 @@ GIT_EXTERN(int) git_reference_dwim(git_reference **out, git_repository *repo, co
* reference does not belong in the standard set (HEAD, branches and * reference does not belong in the standard set (HEAD, branches and
* remote-tracking branches) and it does not have a reflog. * remote-tracking branches) and it does not have a reflog.
* *
* It will also return an error if the reference's value at the time * It will return GIT_EMODIFIED if the reference's value at the time
* of updating does not match the one passed. * of updating does not match the one passed through `current_value`
* (i.e. if the ref has changed since the user read it).
* *
* @param out Pointer to the newly created reference * @param out Pointer to the newly created reference
* @param repo Repository where that reference will live * @param repo Repository where that reference will live
@ -103,9 +104,10 @@ GIT_EXTERN(int) git_reference_dwim(git_reference **out, git_repository *repo, co
* @param force Overwrite existing references * @param force Overwrite existing references
* @param signature The identity that will used to populate the reflog entry * @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 * @param log_message The one line long message to be appended to the reflog
* @param current_value The expected value of the reference when updating
* @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code * @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 git_signature *signature, const char *log_message, const char *old_value); GIT_EXTERN(int) git_reference_symbolic_create_matching(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const git_signature *signature, const char *log_message, const char *current_value);
/** /**
* Create a new symbolic reference. * Create a new symbolic reference.
@ -210,8 +212,9 @@ GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo,
* reference does not belong in the standard set (HEAD, branches and * reference does not belong in the standard set (HEAD, branches and
* remote-tracking branches) and and it does not have a reflog. * remote-tracking branches) and and it does not have a reflog.
* *
* It will also return an error if the reference's value at the time * It will return GIT_EMODIFIED if the reference's value at the time
* of updating does not match the one passed. * of updating does not match the one passed through `current_id`
* (i.e. if the ref has changed since the user read it).
* *
* @param out Pointer to the newly created reference * @param out Pointer to the newly created reference
* @param repo Repository where that reference will live * @param repo Repository where that reference will live
@ -221,11 +224,11 @@ GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo,
* @param force Overwrite existing references * @param force Overwrite existing references
* @param signature The identity that will used to populate the reflog entry * @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 * @param log_message The one line long message to be appended to the reflog
* @param old_id The old value which the reference should have * @param current_id The expected value of the reference at the time of update
* @return 0 on success, GIT_EMODIFIED if the value of the reference * @return 0 on success, GIT_EMODIFIED if the value of the reference
* has changed, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code * 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_signature *signature, const char *log_message, const git_oid *old_id); GIT_EXTERN(int) git_reference_create_matching(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_signature *signature, const char *log_message, const git_oid *current_id);
/** /**
* Get the OID pointed to by a direct reference. * Get the OID pointed to by a direct reference.
@ -350,7 +353,7 @@ GIT_EXTERN(int) git_reference_symbolic_set_target(
* @param signature The identity that will used to populate the reflog entry * @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 * @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 * @return 0 on success, GIT_EMODIFIED if the value of the reference
* has changed, or an error code * has changed since it was read, or an error code
*/ */
GIT_EXTERN(int) git_reference_set_target( GIT_EXTERN(int) git_reference_set_target(
git_reference **out, git_reference **out,

5
src/refdb_fs.c
View File

@ -1018,8 +1018,8 @@ static int refdb_fs_backend__delete(
{ {
refdb_fs_backend *backend = (refdb_fs_backend *)_backend; refdb_fs_backend *backend = (refdb_fs_backend *)_backend;
git_buf loose_path = GIT_BUF_INIT; git_buf loose_path = GIT_BUF_INIT;
size_t pack_pos size_t pack_pos;
; git_filebuf file = GIT_FILEBUF_INIT; git_filebuf file = GIT_FILEBUF_INIT;
int error = 0, cmp = 0; int error = 0, cmp = 0;
bool loose_deleted = 0; bool loose_deleted = 0;
@ -1029,7 +1029,6 @@ static int refdb_fs_backend__delete(
return error; return error;
error = cmp_old_ref(&cmp, _backend, ref_name, old_id, old_target); error = cmp_old_ref(&cmp, _backend, ref_name, old_id, old_target);
//git_filebuf_cleanup(&file);
if (error < 0) if (error < 0)
goto cleanup; goto cleanup;