diff options
author | Ronnie Sahlberg <sahlberg@google.com> | 2014-07-23 10:03:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-03 10:15:50 -0700 |
commit | f46c7bc6ffb731e57194b39c29ed55ef1b1ebaf9 (patch) | |
tree | e1ef3f1087280858efb61aeae4d4e541238f3d79 | |
parent | 2679332664656b13836e6c09516736b2861d850e (diff) | |
download | git-f46c7bc6ffb731e57194b39c29ed55ef1b1ebaf9.tar.gz |
refs.c: only write reflog update if msg is non-NULL
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | refs.c | 5 | ||||
-rw-r--r-- | refs.h | 1 |
2 files changed, 4 insertions, 2 deletions
@@ -3770,8 +3770,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)); @@ -329,6 +329,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, |