Skip to content

Commit 4b7b520

Browse files
mhaggergitster
authored andcommitted
update_ref(): improve documentation
Add a docstring for update_ref(), emphasizing its similarity to ref_transaction_update(). Rename its parameters to match those of ref_transaction_update(). Signed-off-by: Michael Haggerty <[email protected]> Reviewed-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1618033 commit 4b7b520

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

refs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3738,17 +3738,17 @@ int ref_transaction_verify(struct ref_transaction *transaction,
37383738
flags, NULL, err);
37393739
}
37403740

3741-
int update_ref(const char *action, const char *refname,
3742-
const unsigned char *sha1, const unsigned char *oldval,
3741+
int update_ref(const char *msg, const char *refname,
3742+
const unsigned char *new_sha1, const unsigned char *old_sha1,
37433743
unsigned int flags, enum action_on_err onerr)
37443744
{
37453745
struct ref_transaction *t;
37463746
struct strbuf err = STRBUF_INIT;
37473747

37483748
t = ref_transaction_begin(&err);
37493749
if (!t ||
3750-
ref_transaction_update(t, refname, sha1, oldval,
3751-
flags, action, &err) ||
3750+
ref_transaction_update(t, refname, new_sha1, old_sha1,
3751+
flags, msg, &err) ||
37523752
ref_transaction_commit(t, &err)) {
37533753
const char *str = "update_ref failed for ref '%s': %s";
37543754

refs.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,16 @@ int ref_transaction_commit(struct ref_transaction *transaction,
344344
*/
345345
void ref_transaction_free(struct ref_transaction *transaction);
346346

347-
/** Lock a ref and then write its file */
348-
int update_ref(const char *action, const char *refname,
349-
const unsigned char *sha1, const unsigned char *oldval,
347+
/**
348+
* Lock, update, and unlock a single reference. This function
349+
* basically does a transaction containing a single call to
350+
* ref_transaction_update(). The parameters to this function have the
351+
* same meaning as the corresponding parameters to
352+
* ref_transaction_update(). Handle errors as requested by the `onerr`
353+
* argument.
354+
*/
355+
int update_ref(const char *msg, const char *refname,
356+
const unsigned char *new_sha1, const unsigned char *old_sha1,
350357
unsigned int flags, enum action_on_err onerr);
351358

352359
extern int parse_hide_refs_config(const char *var, const char *value, const char *);

0 commit comments

Comments
 (0)