[PATCH v2 05/21] reflog: use avoid constructing .lock path with git_path

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Dec 14, 2013, 10:54 UTC
Message-ID: <1387018507-21999-6-git-send-email-pclouds@gmail.com>
In-Reply-To: <1387018507-21999-1-git-send-email-pclouds@gmail.com>

git_path() understands the path given to it. Unrecognized paths by default go to $GIT_SUPER_DIR/repos/<id>/... in split-repo mode. We want the %s.lock file to be at the same place %s file is. Avoid git_path() in this case and use log_file as %s, which should contain the final path of %s file.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/reflog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 6eb24c8..dc1accf 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -372,7 +372,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
 	if (!file_exists(log_file))
 		goto finish;
 	if (!cmd->dry_run) {
-		newlog_path = git_pathdup("logs/%s.lock", ref);
+		newlog_path = mkpathdup("%s.lock", log_file);
 		cb.newlog = fopen(newlog_path, "w");
 	}

-- 
1.8.5.1.77.g42c48fa