mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 05:20:00 +02:00
Code

refs.c: remove the onerr argument to ref_transaction_commit

Browse Source 
Since all callers now use QUIET_ON_ERR we no longer need to provide an onerr
argument any more. Remove the onerr argument from the ref_transaction_commit
signature.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Michael Haggerty <mhagger@alum.mit.edu>
This commit is contained in:
Ronnie Sahlberg 2014-06-20 07:42:59 -07:00 committed by Junio C Hamano
parent 8bcd37482e
commit 01319837c5
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/update-ref.c
View File

@ -366,8 +366,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
if (end_null)
line_termination = '\0';
update_refs_stdin();
if (ref_transaction_commit(transaction, msg, &err,
UPDATE_REFS_QUIET_ON_ERR))
if (ref_transaction_commit(transaction, msg, &err))
die("%s", err.buf);
ref_transaction_free(transaction);
return 0;

22
refs.c
View File

@ -3491,8 +3491,7 @@ static int ref_update_compare(const void *r1, const void *r2)
}
static int ref_update_reject_duplicates(struct ref_update **updates, int n,
struct strbuf *err,
enum action_on_err onerr)
struct strbuf *err)
{
int i;
for (i = 1; i < n; i++)
@ -3502,22 +3501,13 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n,
if (err)
strbuf_addf(err, str, updates[i]->refname);
switch (onerr) {
case UPDATE_REFS_MSG_ON_ERR:
error(str, updates[i]->refname); break;
case UPDATE_REFS_DIE_ON_ERR:
die(str, updates[i]->refname); break;
case UPDATE_REFS_QUIET_ON_ERR:
break;
}
return 1;
}
return 0;
}
int ref_transaction_commit(struct ref_transaction *transaction,
const char *msg, struct strbuf *err,
enum action_on_err onerr)
const char *msg, struct strbuf *err)
{
int ret = 0, delnum = 0, i;
const char **delnames;
@ -3532,7 +3522,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
/* Copy, sort, and reject duplicate refs */
qsort(updates, n, sizeof(*updates), ref_update_compare);
ret = ref_update_reject_duplicates(updates, n, err, onerr);
ret = ref_update_reject_duplicates(updates, n, err);
if (ret)
goto cleanup;
@ -3544,7 +3534,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
(update->have_old ?
update->old_sha1 : NULL),
update->flags,
&update->type, onerr);
&update->type,
UPDATE_REFS_QUIET_ON_ERR);
if (!update->lock) {
if (err)
strbuf_addf(err, "Cannot lock the ref '%s'.",
@ -3562,7 +3553,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
ret = update_ref_write(msg,
update->refname,
update->new_sha1,
update->lock, err, onerr);
update->lock, err,
UPDATE_REFS_QUIET_ON_ERR);
update->lock = NULL; /* freed by update_ref_write */
if (ret)
goto cleanup;

3
refs.h
View File

@ -282,8 +282,7 @@ void ref_transaction_delete(struct ref_transaction *transaction,
* the transaction failed. The string does not end in newline.
*/
int ref_transaction_commit(struct ref_transaction *transaction,
const char *msg, struct strbuf *err,
enum action_on_err onerr);
const char *msg, struct strbuf *err);
/*
* Free an existing transaction and all associated data.