First batch for post 2.7 cycle

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 4db3e36f89c57c5f2d37cf92d331659a001394f8..c648b5e853c347f0978d835cb057a9a2831bf0dd 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3494,7 +3494,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
                                        get_lock_file_path(lock->lk));
                        rollback_lock_file(&reflog_lock);
                } else if (commit_lock_file(&reflog_lock)) {
-                       status |= error("unable to commit reflog '%s' (%s)",
+                       status |= error("unable to write reflog '%s' (%s)",
                                        log_file, strerror(errno));
                } else if (update && commit_ref(lock)) {
                        status |= error("couldn't set %s", lock->ref_name);