summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2017-03-26 09:42:21 +0700
committerJunio C Hamano <gitster@pobox.com>2017-03-27 10:23:39 -0700
commita5c1efd693a09bd7d058e1370869e061f94b61ed (patch)
tree3131f83f2e0305c24e810059019bb44a1b5bc0b6
parente9dcc3054fb0fdf0faafd0ef57a238f4a692fb23 (diff)
downloadgit-a5c1efd693a09bd7d058e1370869e061f94b61ed.tar.gz
files-backend: move "logs/" out of TMP_RENAMED_LOG
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 <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--refs/files-backend.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 5f9b0ab9bc..3e0bafcaf9 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2510,7 +2510,7 @@ out:
* 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;
@@ -2546,7 +2546,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) {
@@ -2608,7 +2608,7 @@ static int files_rename_ref(struct ref_store *ref_store,
strbuf_git_path(&sb_oldref, "logs/%s", oldrefname);
strbuf_git_path(&sb_newref, "logs/%s", newrefname);
- strbuf_git_path(&tmp_renamed_log, TMP_RENAMED_LOG);
+ strbuf_git_path(&tmp_renamed_log, "logs/%s", TMP_RENAMED_LOG);
log = !lstat(sb_oldref.buf, &loginfo);
if (log && S_ISLNK(loginfo.st_mode)) {
@@ -2633,7 +2633,7 @@ static int files_rename_ref(struct ref_store *ref_store,
}
if (log && rename(sb_oldref.buf, tmp_renamed_log.buf)) {
- ret = error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s",
+ ret = error("unable to move logfile logs/%s to logs/"TMP_RENAMED_LOG": %s",
oldrefname, strerror(errno));
goto out;
}
@@ -2719,7 +2719,7 @@ static int files_rename_ref(struct ref_store *ref_store,
oldrefname, newrefname, strerror(errno));
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));
ret = 1;
out: