diff options
| author |  Ronnie Sahlberg <sahlberg@google.com> | 2014-06-20 07:42:58 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-07-14 11:54:42 -0700 |
| commit | 8bcd37482e95b47119f3a8f03a1c8ce5815594a3 (patch) | |
| tree | c37816ef45cb5947b880272c0f2c81c94ea923e1 /builtin/update-ref.c | |
| parent | refs.c: make update_ref_write update a strbuf on failure (diff) | |
| download | tgif-8bcd37482e95b47119f3a8f03a1c8ce5815594a3.tar.xz | |
update-ref: use err argument to get error from ref_transaction_commit
Call ref_transaction_commit with QUIET_ON_ERR and use the strbuf that is
returned to print a log message if/after the transaction fails.
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>
Diffstat (limited to 'builtin/update-ref.c')
| -rw-r--r-- | builtin/update-ref.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 22617afb0a..aec9004207 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -342,6 +342,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) const char *refname, *oldval, *msg = NULL; unsigned char sha1[20], oldsha1[20]; int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0, flags = 0; + struct strbuf err = STRBUF_INIT; struct option options[] = { OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")), OPT_BOOL('d', NULL, &delete, N_("delete the reference")), @@ -359,18 +360,17 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) die("Refusing to perform update with empty message."); if (read_stdin) { - int ret; transaction = ref_transaction_begin(); - if (delete || no_deref || argc > 0) usage_with_options(git_update_ref_usage, options); if (end_null) line_termination = '\0'; update_refs_stdin(); - ret = ref_transaction_commit(transaction, msg, NULL, - UPDATE_REFS_DIE_ON_ERR); + if (ref_transaction_commit(transaction, msg, &err, + UPDATE_REFS_QUIET_ON_ERR)) + die("%s", err.buf); ref_transaction_free(transaction); - return ret; + return 0; } if (end_null) |