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 | 4 +++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index b99fcd9..f2619e1 100644 --- a/refs.c +++ b/refs.c @@ -3714,7 +3714,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]; @@ -3722,7 +3727,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 ae8a800..5748cde 100644 --- a/refs.h +++ b/refs.h @@ -317,8 +317,10 @@ int transaction_delete_sha1(struct ref_transaction *transaction, int flags, int have_old, const char *msg, struct strbuf *err); +#define REFLOG_TRUNCATE 0x01 /* - * Append a reflog entry for refname. + * 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.578.gb9e379f -- 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