Add a flag that allows us to truncate the reflog before we write the
update.

Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
---
 refs.c | 17 +++++++++++++++--
 refs.h | 10 +++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/refs.c b/refs.c
index b010d6d..181c957 100644
--- a/refs.c
+++ b/refs.c
@@ -3747,7 +3747,12 @@ int transaction_commit(struct ref_transaction 
*transaction,
                }
        }
 
-       /* Update all reflog files */
+       /*
+        * Update all reflog files
+        * We have already done all ref updates and deletes.
+        * There is not much we can do here if there are any reflog
+        * update errors other than complain.
+        */
        for (i = 0; i < n; i++) {
                struct ref_update *update = updates[i];
 
@@ -3755,7 +3760,15 @@ int transaction_commit(struct ref_transaction 
*transaction,
                        continue;
                if (update->reflog_fd == -1)
                        continue;
-
+               if (update->flags & REFLOG_TRUNCATE)
+                       if (lseek(update->reflog_fd, 0, SEEK_SET) < 0 ||
+                               ftruncate(update->reflog_fd, 0)) {
+                               error("Could not truncate reflog: %s. %s",
+                                     update->refname, strerror(errno));
+                               rollback_lock_file(&update->reflog_lock);
+                               update->reflog_fd = -1;
+                               continue;
+                       }
                if (log_ref_write_fd(update->reflog_fd, update->old_sha1,
                                     update->new_sha1,
                                     update->committer, update->msg)) {
diff --git a/refs.h b/refs.h
index 32bc4ae..66cf38b 100644
--- a/refs.h
+++ b/refs.h
@@ -321,7 +321,15 @@ int transaction_delete_sha1(struct ref_transaction 
*transaction,
                            struct strbuf *err);
 
 /*
- * Append a reflog entry for refname.
+ * Flags controlling transaction_update_reflog().
+ * REFLOG_TRUNCATE: Truncate the reflog.
+ *
+ * Flags >= 0x100 are reserved for internal use.
+ */
+#define REFLOG_TRUNCATE 0x01
+/*
+ * Append a reflog entry for refname. If the REFLOG_TRUNCATE flag is set
+ * this update will first truncate the reflog before writing the entry.
  */
 int transaction_update_reflog(struct ref_transaction *transaction,
                              const char *refname,
-- 
2.0.1.508.g763ab16

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