Ronnie Sahlberg <sahlb...@google.com> writes:
> commit 020ed65a12838bdead64bc3c5de249d3c8f5cfd8 upstream.
>
> 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.
Does any existing caller call this codepath with update->msg == NULL?
Will "please truncate" stay to be the only plausible special cause
to call into this codepath without having any meaningful message?
I am trying to make sure that this patch is not painting us into a
corner where we will find out another reason for doing something
esoteric in this codepath but need to find a way other than setting
msg to NULL for the caller to trigger that new codepath. Put it in
another way, please convince me that a new boolean field in update,
e.g. update->truncate_reflog, is way overkill for this.
>
> Change-Id: I44c89caa7e7c4960777b79cfb5d339a5aa3ddf7a
> Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
> Signed-off-by: Jonathan Nieder <jrnie...@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,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
