undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

files-backend: move "logs/" out of TMP_RENAMED_LOG

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2017-03-26 09:42:21 +07:00 committed by Junio C Hamano
parent e9dcc3054f
commit a5c1efd693
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
refs/files-backend.c
View File

@ -2510,7 +2510,7 @@ out:
* IOW, to avoid cross device rename errors, the temporary renamed log must * IOW, to avoid cross device rename errors, the temporary renamed log must
* live into logs/refs. * live into logs/refs.
*/ */
#define TMP_RENAMED_LOG "logs/refs/.tmp-renamed-log" #define TMP_RENAMED_LOG "refs/.tmp-renamed-log"
struct rename_cb { struct rename_cb {
const char *tmp_renamed_log; const char *tmp_renamed_log;
@ -2546,7 +2546,7 @@ static int rename_tmp_log(const char *newrefname)
int ret; int ret;
strbuf_git_path(&path, "logs/%s", newrefname); 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; cb.tmp_renamed_log = tmp.buf;
ret = raceproof_create_file(path.buf, rename_tmp_log_callback, &cb); ret = raceproof_create_file(path.buf, rename_tmp_log_callback, &cb);
if (ret) { 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_oldref, "logs/%s", oldrefname);
strbuf_git_path(&sb_newref, "logs/%s", newrefname); 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); log = !lstat(sb_oldref.buf, &loginfo);
if (log && S_ISLNK(loginfo.st_mode)) { 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)) { 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)); oldrefname, strerror(errno));
goto out; goto out;
} }
@ -2719,7 +2719,7 @@ static int files_rename_ref(struct ref_store *ref_store,
oldrefname, newrefname, strerror(errno)); oldrefname, newrefname, strerror(errno));
if (!logmoved && log && if (!logmoved && log &&
rename(tmp_renamed_log.buf, sb_oldref.buf)) 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)); oldrefname, strerror(errno));
ret = 1; ret = 1;
out: out: