[PATCH 09/11] refs.c: only write reflog update if msg is non-NULL
- From
Ronnie Sahlberg <sahlberg@google.com>
- Date
- Jun 4, 2014, 18:57 UTC
- Message-ID
- <1401908272-7600-10-git-send-email-sahlberg@google.com>
- In-Reply-To
- <1401908272-7600-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.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> --- refs.c | 5 +++-- refs.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c index f2619e1..8faf5c1 100644 --- a/refs.c +++ b/refs.c @@ -3736,8 +3736,9 @@ int transaction_commit(struct ref_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 5748cde..1b6a055 100644 --- a/refs.h +++ b/refs.h @@ -321,6 +321,7 @@ int transaction_delete_sha1(struct ref_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 ref_transaction *transaction, const char *refname,
-- 2.0.0.578.gb9e379f