diff options
| author |  Ronnie Sahlberg <sahlberg@google.com> | 2014-05-19 10:42:34 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-09-03 10:04:08 -0700 |
| commit | 93a644ea9d3702cc1cc62c0d413f81f8e46fabe7 (patch) | |
| tree | 5a979693e1d3c05ced16fde95b012f6d951e496f /builtin/update-ref.c | |
| parent | refs.c: update ref_transaction_delete to check for error and return status (diff) | |
| download | tgif-93a644ea9d3702cc1cc62c0d413f81f8e46fabe7.tar.xz | |
refs.c: make ref_transaction_begin take an err argument
Add an err argument to _begin so that on non-fatal failures in future ref
backends we can report a nice error back to the caller.
While _begin can currently never fail for other reasons than OOM, in which
case we die() anyway, we may add other types of backends in the future.
For example, a hypothetical MySQL backend could fail in _begin with
"Can not connect to MySQL server. No route to host".
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-ref.c')
| -rw-r--r-- | builtin/update-ref.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 7c9c248e54..96a53b92ae 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -365,7 +365,9 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) die("Refusing to perform update with empty message."); if (read_stdin) { - transaction = ref_transaction_begin(); + transaction = ref_transaction_begin(&err); + if (!transaction) + die("%s", err.buf); if (delete || no_deref || argc > 0) usage_with_options(git_update_ref_usage, options); if (end_null) @@ -374,6 +376,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) if (ref_transaction_commit(transaction, msg, &err)) die("%s", err.buf); ref_transaction_free(transaction); + strbuf_release(&err); return 0; } |