git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v2 08/14] refs.c: add a flag to allow reflog updates to truncate the log
Date: Mon, 16 Jun 2014 09:51:39 -0700	[thread overview]
Message-ID: <1402937505-6091-9-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1402937505-6091-1-git-send-email-sahlberg@google.com>

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

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

diff --git a/refs.c b/refs.c
index 9db5896..379b50e 100644
--- a/refs.c
+++ b/refs.c
@@ -3763,7 +3763,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];
 
@@ -3771,7 +3776,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 5f4deef..7c3a9ca 100644
--- a/refs.h
+++ b/refs.h
@@ -327,7 +327,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.0.770.gd892650.dirty

  parent reply	other threads:[~2014-06-16 16:52 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-16 16:51 [PATCH v2 00/14] ref-transactions-reflog Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 01/14] refs.c make ref_transaction_create a wrapper to ref_transaction_update Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 02/14] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 03/14] refs.c: rename the transaction functions Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 04/14] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 05/14] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 06/14] lockfile.c: make hold_lock_file_for_append preserve meaningful errno Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 07/14] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-06-16 16:51 ` Ronnie Sahlberg [this message]
2014-06-16 16:51 ` [PATCH v2 09/14] refs.c: only write reflog update if msg is non-NULL Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 10/14] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 11/14] reflog.c: use a reflog transaction when writing during expire Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 12/14] refs.c: rename log_ref_setup to create_reflog Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 13/14] refs.c: make unlock_ref/close_ref/commit_ref static Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 14/14] refs.c: remove lock_any_ref_for_update Ronnie Sahlberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1402937505-6091-9-git-send-email-sahlberg@google.com \
    --to=sahlberg@google.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).