From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v3 08/19] refs.c: change ref_transaction_update() to do error checking and return status
Date: Fri, 25 Apr 2014 09:14:43 -0700 [thread overview]
Message-ID: <1398442494-23438-9-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1398442494-23438-1-git-send-email-sahlberg@google.com>
Update ref_transaction_update() do some basic error checking and return
true on error. Update all callers to check ref_transaction_update() for error.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
builtin/update-ref.c | 10 ++++++----
refs.c | 9 +++++++--
refs.h | 10 +++++-----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index df3cd92..13d094d 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -197,8 +197,9 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
if (*next != line_termination)
die("update %s: extra input: %s", refname, next);
- ref_transaction_update(transaction, refname, new_sha1, old_sha1,
- update_flags, have_old);
+ if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
+ update_flags, have_old))
+ die("update %s: failed", refname);
update_flags = 0;
free(refname);
@@ -286,8 +287,9 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next)
if (*next != line_termination)
die("verify %s: extra input: %s", refname, next);
- ref_transaction_update(transaction, refname, new_sha1, old_sha1,
- update_flags, have_old);
+ if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
+ update_flags, have_old))
+ die("failed transaction update for %s", refname);
update_flags = 0;
free(refname);
diff --git a/refs.c b/refs.c
index 0e2df81..65cf407 100644
--- a/refs.c
+++ b/refs.c
@@ -3334,19 +3334,24 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
return update;
}
-void ref_transaction_update(struct ref_transaction *transaction,
+int ref_transaction_update(struct ref_transaction *transaction,
const char *refname,
const unsigned char *new_sha1,
const unsigned char *old_sha1,
int flags, int have_old)
{
- struct ref_update *update = add_update(transaction, refname);
+ struct ref_update *update;
+
+ if (have_old && !old_sha1)
+ die("have_old is true but old_sha1 is NULL");
+ update = add_update(transaction, refname);
hashcpy(update->new_sha1, new_sha1);
update->flags = flags;
update->have_old = have_old;
if (have_old)
hashcpy(update->old_sha1, old_sha1);
+ return 0;
}
void ref_transaction_create(struct ref_transaction *transaction,
diff --git a/refs.h b/refs.h
index f3db632..6a361d7 100644
--- a/refs.h
+++ b/refs.h
@@ -237,11 +237,11 @@ void ref_transaction_rollback(struct ref_transaction *transaction);
* that the reference should have had before the update, or zeros if
* it must not have existed beforehand.
*/
-void ref_transaction_update(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
- int flags, int have_old);
+int ref_transaction_update(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ int flags, int have_old);
/*
* Add a reference creation to transaction. new_sha1 is the value
--
1.9.1.521.g5dc89fa
next prev parent reply other threads:[~2014-04-25 16:16 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 16:14 [PATCH v3 00/19] Use ref transactions from most callers Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 01/19] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 02/19] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 03/19] refs.c: make ref_transaction_commit return an error string Ronnie Sahlberg
2014-04-25 22:10 ` Jonathan Nieder
2014-04-28 17:46 ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 04/19] refs.c: return error string from ref_update_reject_duplicates on failure Ronnie Sahlberg
2014-04-25 22:12 ` Jonathan Nieder
2014-04-28 18:23 ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 05/19] update-ref.c: use the error string from _commit to print better message Ronnie Sahlberg
2014-04-25 22:36 ` Jonathan Nieder
2014-04-28 15:11 ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 06/19] refs.c: make update_ref_write to return error string on failure Ronnie Sahlberg
2014-04-25 22:45 ` Jonathan Nieder
2014-04-28 18:23 ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 07/19] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-04-25 22:47 ` Jonathan Nieder
2014-04-28 18:27 ` Ronnie Sahlberg
2014-04-25 16:14 ` Ronnie Sahlberg [this message]
2014-04-25 16:14 ` [PATCH v3 09/19] refs.c: change ref_transaction_create to do error checking and return status Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 10/19] refs.c: ref_transaction_delete to check for error " Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 11/19] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-04-25 22:58 ` Michael Haggerty
2014-04-28 15:15 ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 12/19] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-04-25 23:00 ` Michael Haggerty
2014-04-28 15:17 ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 13/19] commit.c: use ref transactions " Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 14/19] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 15/19] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 16/19] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-04-25 23:16 ` Michael Haggerty
2014-04-28 19:16 ` Ronnie Sahlberg
2014-04-29 9:35 ` Michael Haggerty
2014-04-29 15:11 ` Ronnie Sahlberg
2014-04-29 17:15 ` Junio C Hamano
2014-04-25 16:14 ` [PATCH v3 17/19] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-04-25 23:28 ` Michael Haggerty
2014-04-28 18:33 ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 18/19] refs.c: free the transaction before returning when number of updates is 0 Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 19/19] refs.c: pass **transaction to commit and have it clear the pointer Ronnie Sahlberg
2014-04-26 1:31 ` Michael Haggerty
2014-04-28 17:59 ` Ronnie Sahlberg
2014-04-29 9:25 ` Michael Haggerty
2014-04-29 18:58 ` Ronnie Sahlberg
2014-04-30 14:20 ` Michael Haggerty
2014-04-25 21:53 ` [PATCH v3 00/19] Use ref transactions from most callers Jonathan Nieder
2014-04-25 22:04 ` Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398442494-23438-9-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).