[PATCH 00/11] Use ref transactions from most callers · Ronnie Sahlberg <hidden> · 2016-06-15
[PATCH 01/11] refs.c: constify the sha arguments for ref_transaction_create|delete|update · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 01/11] refs.c: constify the sha arguments for ref_transaction_create|delete|update · Michael Haggerty <hidden> · 2016-06-15
[PATCH 02/11] refs.c: change ref_transaction_update() to do error checking and return status · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 02/11] refs.c: change ref_transaction_update() to do error checking and return status · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH 02/11] refs.c: change ref_transaction_update() to do error checking and return status · Jonathan Nieder <hidden> · 2016-06-15
[PATCH 03/11] refs.c: change ref_transaction_create to do error checking and return status · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 03/11] refs.c: change ref_transaction_create to do error checking and return status · Michael Haggerty <hidden> · 2016-06-15
[PATCH 04/11] refs.c: ref_transaction_delete to check for error and return status · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 04/11] refs.c: ref_transaction_delete to check for error and return status · Michael Haggerty <hidden> · 2016-06-15
[PATCH 05/11] tag.c: use ref transactions when doing updates · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 05/11] tag.c: use ref transactions when doing updates · Michael Haggerty <hidden> · 2016-06-15
[PATCH 07/11] commit.c: use ref transactions for updates · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 07/11] commit.c: use ref transactions for updates · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH 07/11] commit.c: use ref transactions for updates · Ronnie Sahlberg <hidden> · 2016-06-15
[PATCH 08/11] sequencer.c: use ref transactions for all ref updates · Ronnie Sahlberg <hidden> · 2016-06-15
[PATCH 09/11] fast-import.c: change update_branch to use ref transactions · Ronnie Sahlberg <hidden> · 2016-06-15
[PATCH 10/11] branch.c: use ref transaction for all ref updates · Ronnie Sahlberg <hidden> · 2016-06-15
[PATCH 11/11] walker.c: use ref transaction for ref updates · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 11/11] walker.c: use ref transaction for ref updates · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH 11/11] walker.c: use ref transaction for ref updates · Ronnie Sahlberg <hidden> · 2016-06-15
[PATCH 06/11] replace.c: use the ref transaction functions for updates · Ronnie Sahlberg <hidden> · 2016-06-15
Re: [PATCH 06/11] replace.c: use the ref transaction functions for updates · Michael Haggerty <hidden> · 2016-06-15

[PATCH 03/11] refs.c: change ref_transaction_create to do error checking and return status

STALE3764d

From: Ronnie Sahlberg <hidden>
Date: 2016-06-15 23:00:43
Subsystem: the rest · Maintainer: Linus Torvalds

Revision v1 of 3 in this series.

Revisions (3)

2016-06-15 v1 current
2016-06-15 v2 [diff vs current]
2016-06-15 v3 [diff vs current]

Do basic error checking in ref_transaction_create() and make it return
status. Update all callers to check the result of ref_transaction_create()

Signed-off-by: Ronnie Sahlberg <redacted>
---
 builtin/update-ref.c |  4 +++-
 refs.c               | 17 +++++++++++------
 refs.h               |  8 ++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 12bfacc..1b8a087 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c

@@ -226,7 +226,9 @@ static const char *parse_cmd_create(struct strbuf *input, const char *next)
 	if (*next != line_termination)
 		die("create %s: extra input: %s", refname, next);
 
-	ref_transaction_create(transaction, refname, new_sha1, update_flags);
+	if(ref_transaction_create(transaction, refname, new_sha1,
+				  update_flags))
+		die("failed transaction create for %s", refname);
 
 	update_flags = 0;
 	free(refname);

diff --git a/refs.c b/refs.c
index da1761d..c46249f 100644
--- a/refs.c
+++ b/refs.c

@@ -3347,18 +3347,23 @@ int ref_transaction_update(struct ref_transaction *transaction,
 	return 0;
 }
 
-void ref_transaction_create(struct ref_transaction *transaction,
-			    const char *refname,
-			    const unsigned char *new_sha1,
-			    int flags)
+int ref_transaction_create(struct ref_transaction *transaction,
+			   const char *refname,
+			   const unsigned char *new_sha1,
+			   int flags)
 {
-	struct ref_update *update = add_update(transaction, refname);
+	struct ref_update *update;
+
+	if (!new_sha1 || is_null_sha1(new_sha1))
+		return error("create ref with null new_sha1");
+
+	update = add_update(transaction, refname);
 
-	assert(!is_null_sha1(new_sha1));
 	hashcpy(update->new_sha1, new_sha1);
 	hashclr(update->old_sha1);
 	update->flags = flags;
 	update->have_old = 1;
+	return 0;
 }
 
 void ref_transaction_delete(struct ref_transaction *transaction,

diff --git a/refs.h b/refs.h
index 00e4f7b..8799e15 100644
--- a/refs.h
+++ b/refs.h

@@ -249,10 +249,10 @@ int ref_transaction_update(struct ref_transaction *transaction,
  * null SHA-1.  It is verified that the reference does not exist
  * already.
  */
-void ref_transaction_create(struct ref_transaction *transaction,
-			    const char *refname,
-			    const unsigned char *new_sha1,
-			    int flags);
+int ref_transaction_create(struct ref_transaction *transaction,
+			   const char *refname,
+			   const unsigned char *new_sha1,
+			   int flags);
 
 /*
  * Add a reference deletion to transaction.  If have_old is true, then

-- 
1.9.1.513.gd486896

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help