зеркало из https://github.com/microsoft/git.git
refs.c: add a strbuf argument to ref_transaction_commit for error logging
Add a strbuf argument to _commit so that we can pass an error string back to the caller. So that we can do error logging from the caller instead of from _commit. Longer term plan is to first convert all callers to use onerr==QUIET_ON_ERR and craft any log messages from the callers themselves and finally remove the onerr argument completely. 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:
Родитель
1b07255c95
Коммит
995f8746bc
|
@ -367,7 +367,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
|||
if (end_null)
|
||||
line_termination = '\0';
|
||||
update_refs_stdin();
|
||||
ret = ref_transaction_commit(transaction, msg,
|
||||
ret = ref_transaction_commit(transaction, msg, NULL,
|
||||
UPDATE_REFS_DIE_ON_ERR);
|
||||
ref_transaction_free(transaction);
|
||||
return ret;
|
||||
|
|
6
refs.c
6
refs.c
|
@ -3444,7 +3444,8 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n,
|
|||
}
|
||||
|
||||
int ref_transaction_commit(struct ref_transaction *transaction,
|
||||
const char *msg, enum action_on_err onerr)
|
||||
const char *msg, struct strbuf *err,
|
||||
enum action_on_err onerr)
|
||||
{
|
||||
int ret = 0, delnum = 0, i;
|
||||
const char **delnames;
|
||||
|
@ -3473,6 +3474,9 @@ int ref_transaction_commit(struct ref_transaction *transaction,
|
|||
update->flags,
|
||||
&update->type, onerr);
|
||||
if (!update->lock) {
|
||||
if (err)
|
||||
strbuf_addf(err, "Cannot lock the ref '%s'.",
|
||||
update->refname);
|
||||
ret = 1;
|
||||
goto cleanup;
|
||||
}
|
||||
|
|
5
refs.h
5
refs.h
|
@ -269,9 +269,12 @@ void ref_transaction_delete(struct ref_transaction *transaction,
|
|||
* Commit all of the changes that have been queued in transaction, as
|
||||
* atomically as possible. Return a nonzero value if there is a
|
||||
* problem.
|
||||
* If err is non-NULL we will add an error string to it to explain why
|
||||
* the transaction failed. The string does not end in newline.
|
||||
*/
|
||||
int ref_transaction_commit(struct ref_transaction *transaction,
|
||||
const char *msg, enum action_on_err onerr);
|
||||
const char *msg, struct strbuf *err,
|
||||
enum action_on_err onerr);
|
||||
|
||||
/*
|
||||
* Free an existing transaction and all associated data.
|
||||
|
|
Загрузка…
Ссылка в новой задаче