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 <sahlb...@google.com>
---
 refs.c | 5 +++--
 refs.h | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/refs.c b/refs.c
index 379b50e..2163c90 100644
--- a/refs.c
+++ b/refs.c
@@ -3785,8 +3785,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 7c3a9ca..b0e339b 100644
--- a/refs.h
+++ b/refs.h
@@ -336,6 +336,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.770.gd892650.dirty

--
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

Reply via email to