From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, sahlberg@google.com, git@vger.kernel.org,
mhagger@alum.mit.edu, jrnieder@gmail.com
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH v2 2/2] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
Date: Thu, 20 Nov 2014 09:39:10 -0800 [thread overview]
Message-ID: <1416505150-1913-1-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <20141120011136.GC6527@google.com>
From: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
---
no changes in code, just removing Jonathans sign off, adding reviewed-by
by Michael and Jonathan
refs.c | 22 ++--------------------
refs.h | 2 +-
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/refs.c b/refs.c
index 005eb18..05cb299 100644
--- a/refs.c
+++ b/refs.c
@@ -3633,26 +3633,8 @@ int ref_transaction_delete(struct ref_transaction *transaction,
int flags, int have_old, const char *msg,
struct strbuf *err)
{
- struct ref_update *update;
-
- assert(err);
-
- if (transaction->state != REF_TRANSACTION_OPEN)
- die("BUG: delete called for transaction that is not open");
-
- if (have_old && !old_sha1)
- die("BUG: have_old is true but old_sha1 is NULL");
-
- update = add_update(transaction, refname);
- update->flags = flags;
- update->have_old = have_old;
- if (have_old) {
- assert(!is_null_sha1(old_sha1));
- hashcpy(update->old_sha1, old_sha1);
- }
- if (msg)
- update->msg = xstrdup(msg);
- return 0;
+ return ref_transaction_update(transaction, refname, null_sha1,
+ old_sha1, flags, have_old, msg, err);
}
int update_ref(const char *action, const char *refname,
diff --git a/refs.h b/refs.h
index 2bc3556..7d675b7 100644
--- a/refs.h
+++ b/refs.h
@@ -283,7 +283,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
/*
* Add a reference update to transaction. new_sha1 is the value that
- * the reference should have after the update, or zeros if it should
+ * the reference should have after the update, or null_sha1 if it should
* be deleted. If have_old is true, then old_sha1 holds the value
* that the reference should have had before the update, or zeros if
* it must not have existed beforehand.
--
2.2.0.rc2.23.gca0107e
next prev parent reply other threads:[~2014-11-20 17:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 21:40 [PATCH 0/2] Breaking the ref-transactions-reflog series in smaller parts Stefan Beller
2014-11-19 21:40 ` [PATCH 1/2] refs.c: make ref_transaction_create a wrapper for ref_transaction_update Stefan Beller
2014-11-20 1:10 ` Jonathan Nieder
2014-11-20 1:12 ` Stefan Beller
2014-11-20 1:37 ` Jonathan Nieder
2014-11-20 16:00 ` Jeff King
2014-11-20 17:38 ` [PATCH v2 " Stefan Beller
2014-11-20 18:03 ` [PATCH " Jonathan Nieder
2014-11-20 18:18 ` Jeff King
2014-11-19 21:40 ` [PATCH 2/2] refs.c: make ref_transaction_delete " Stefan Beller
2014-11-20 1:11 ` Jonathan Nieder
2014-11-20 17:39 ` Stefan Beller [this message]
2014-11-20 18:05 ` [PATCH v2 " Junio C Hamano
2014-11-20 11:03 ` [PATCH 0/2] Breaking the ref-transactions-reflog series in smaller parts Michael Haggerty
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=1416505150-1913-1-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=sahlberg@google.com \
/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).