From: Ronnie Sahlberg Date: Wed, 14 May 2014 22:13:07 GMT Subject: [PATCH 08/31] refs.c: only write reflog update if msg is non-NULL Message-ID: <1400105610-21194-9-git-send-email-sahlberg@google.com> In-Reply-To: <1400105610-21194-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 --- refs.c | 8 +++++--- refs.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index a8b583a..a3f60ad 100644 --- a/refs.c +++ b/refs.c @@ -3625,9 +3625,11 @@ int transaction_commit(struct ref_transaction *transaction, ftruncate(update->reflog_fd, 0)) { error("Could not truncate reflog"); } - if (log_ref_write_fd(update->reflog_fd, update->old_sha1, - update->new_sha1, - update->committer, update->msg)) { + if (update->msg && log_ref_write_fd(update->reflog_fd, + update->old_sha1, + update->new_sha1, + update->committer, + update->msg)) { rollback_lock_file(&update->reflog_lock); update->reflog_fd = -1; } diff --git a/refs.h b/refs.h index b1b97e7..c552f04 100644 --- a/refs.h +++ b/refs.h @@ -273,6 +273,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.rc3.506.g3739a35