lockfile: show absolute filename in unable_to_lock_message
When calling a git command from a subdirectory and a file locking fails, the user will get a path relative to the root of the worktree, which is invalid from the place where the command is ran. Make it easy for the user to know which file it is. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Jan 7, 2010 at 15:54 UTC
a8c37a0e011d67e3192834a0fffe17452ea57a08
1 file changed
+3
-2
lockfile.c
+3
-2
@@ -164,9 +164,10 @@ static char *unable_to_lock_message(const char *path, int err)
164
"If no other git process is currently running, this probably means a\n"
165
"git process crashed in this repository earlier. Make sure no other git\n"
166
"process is running and remove the file manually to continue.",
167
- path, strerror(err));
167
+ make_nonrelative_path(path), strerror(err));
168
} else
169
- strbuf_addf(&buf, "Unable to create '%s.lock': %s", path, strerror(err));
169
+ strbuf_addf(&buf, "Unable to create '%s.lock': %s",
170
+ make_nonrelative_path(path), strerror(err));
171
return strbuf_detach(&buf, NULL);
172
}
173