[PATCH v5 05/24] files-backend: move "logs/" out of TMP_RENAMED_LOG

[Nguyễn Thái Ngọc Duy]

This makes reflog path building consistent, always in the form of

    strbuf_git_path(sb, "logs/%s", refname);

It reduces the mental workload a bit in the next patch when that
function call is converted.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 refs/files-backend.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 435db1293..69946b0de 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2513,7 +2513,7 @@ static int files_delete_refs(struct ref_store *ref_store,
  * IOW, to avoid cross device rename errors, the temporary renamed log must
  * live into logs/refs.
  */
-#define TMP_RENAMED_LOG  "logs/refs/.tmp-renamed-log"
+#define TMP_RENAMED_LOG  "refs/.tmp-renamed-log"
 
 struct rename_cb {
        const char *tmp_renamed_log;
@@ -2549,7 +2549,7 @@ static int rename_tmp_log(const char *newrefname)
        int ret;
 
        strbuf_git_path(&path, "logs/%s", newrefname);
-       strbuf_git_path(&tmp, TMP_RENAMED_LOG);
+       strbuf_git_path(&tmp, "logs/%s", TMP_RENAMED_LOG);
        cb.tmp_renamed_log = tmp.buf;
        ret = raceproof_create_file(path.buf, rename_tmp_log_callback, &cb);
        if (ret) {
@@ -2626,12 +2626,12 @@ static int files_rename_ref(struct ref_store *ref_store,
                return 1;
 
        strbuf_git_path(&sb_oldref, "logs/%s", oldrefname);
-       strbuf_git_path(&tmp_renamed_log, TMP_RENAMED_LOG);
+       strbuf_git_path(&tmp_renamed_log, "logs/%s", TMP_RENAMED_LOG);
        ret = log && rename(sb_oldref.buf, tmp_renamed_log.buf);
        strbuf_release(&sb_oldref);
        strbuf_release(&tmp_renamed_log);
        if (ret)
-               return error("unable to move logfile logs/%s to 
"TMP_RENAMED_LOG": %s",
+               return error("unable to move logfile logs/%s to 
logs/"TMP_RENAMED_LOG": %s",
                        oldrefname, strerror(errno));
 
        if (delete_ref(oldrefname, orig_sha1, REF_NODEREF)) {
@@ -2714,10 +2714,10 @@ static int files_rename_ref(struct ref_store *ref_store,
        if (logmoved && rename(sb_newref.buf, sb_oldref.buf))
                error("unable to restore logfile %s from %s: %s",
                        oldrefname, newrefname, strerror(errno));
-       strbuf_git_path(&tmp_renamed_log, TMP_RENAMED_LOG);
+       strbuf_git_path(&tmp_renamed_log, "logs/%s", TMP_RENAMED_LOG);
        if (!logmoved && log &&
            rename(tmp_renamed_log.buf, sb_oldref.buf))
-               error("unable to restore logfile %s from "TMP_RENAMED_LOG": %s",
+               error("unable to restore logfile %s from 
logs/"TMP_RENAMED_LOG": %s",
                        oldrefname, strerror(errno));
        strbuf_release(&sb_newref);
        strbuf_release(&sb_oldref);
-- 
2.11.0.157.gd943d85