From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v2 09/15] refs.c: only write reflog update if msg is non-NULL
Date: Mon, 3 Nov 2014 08:55:51 -0800 [thread overview]
Message-ID: <1415033757-9539-10-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1415033757-9539-1-git-send-email-sahlberg@google.com>
When performing a reflog transaction update, only write to the reflog iff
msg is non-NULL. This can then be combined with REFLOG_TRUNCATE to perform
an update that only truncates but does not write.
This change only affects whether or not a reflog entry should be generated
and written. If msg==NULL then no such entry will be written.
Orthogonal to this we have a boolean flag REFLOG_TRUNCATE which is used to
tell the transaction system to "truncate the reflog and thus discard all
previous users".
At the current time the only place where we use msg==NULL is also the place
where we use REFLOG_TRUNCATE. Eveni though these two settings are currently
only ever used together it still makes sense to have them through two
separate knobs.
This allows future consumers of this API that may want to do things
differently. For example someone can do:
msg="Reflog truncated by Bob because ..." + REFLOG_TRUNCATE
and have it truncate the log and have it start fresh with an initial message
that explains the log was truncated. This API allows that.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
refs.c | 5 +++--
refs.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index d54c3b9..f14b76e 100644
--- a/refs.c
+++ b/refs.c
@@ -3895,8 +3895,9 @@ int transaction_commit(struct transaction *transaction,
update->reflog_fd = -1;
continue;
}
- if (log_ref_write_fd(update->reflog_fd, update->old_sha1,
- update->new_sha1,
+ if (update->msg &&
+ log_ref_write_fd(update->reflog_fd,
+ update->old_sha1, update->new_sha1,
update->committer, update->msg)) {
error("Could write to reflog: %s. %s",
update->refname, strerror(errno));
diff --git a/refs.h b/refs.h
index 5075073..bf96b36 100644
--- a/refs.h
+++ b/refs.h
@@ -337,6 +337,7 @@ int transaction_delete_ref(struct transaction *transaction,
/*
* Append a reflog entry for refname. If the REFLOG_TRUNCATE flag is set
* this update will first truncate the reflog before writing the entry.
+ * If msg is NULL no update will be written to the log.
*/
int transaction_update_reflog(struct transaction *transaction,
const char *refname,
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-11-03 16:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 16:55 [PATCH v2 00/15] ref-transactions-reflog Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 01/15] refs.c make ref_transaction_create a wrapper to ref_transaction_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 03/15] refs.c: rename the transaction functions Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 04/15] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 05/15] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 06/15] copy.c: make copy_fd preserve meaningful errno Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 07/15] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 08/15] refs.c: add a flag to allow reflog updates to truncate the log Ronnie Sahlberg
2014-11-03 16:55 ` Ronnie Sahlberg [this message]
2014-11-03 16:55 ` [PATCH v2 10/15] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 11/15] reflog.c: use a reflog transaction when writing during expire Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 12/15] refs.c: rename log_ref_setup to create_reflog Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 13/15] refs.c: make unlock_ref/close_ref/commit_ref static Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 14/15] refs.c: remove lock_any_ref_for_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 15/15] refs.c: allow deleting refs with a broken sha1 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=1415033757-9539-10-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.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).