Just ping-ing ... I think the patch makes sense. Junio, can you either queue the patch, or argue against it? I promise I'll be nice if you chose the second option ;-). Thanks, Matthieu Moy <Matthieu.Moy@xxxxxxx> writes: > 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@xxxxxxx> > --- >> Since these are merely informative, wouldn't it be more suitable to >> use make_nonrelative_path()? > > Sensible, yes. > > lockfile.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/lockfile.c b/lockfile.c > index 6851fa5..b0d74cd 100644 > --- a/lockfile.c > +++ b/lockfile.c > @@ -164,9 +164,10 @@ static char *unable_to_lock_message(const char *path, int err) > "If no other git process is currently running, this probably means a\n" > "git process crashed in this repository earlier. Make sure no other git\n" > "process is running and remove the file manually to continue.", > - path, strerror(err)); > + make_nonrelative_path(path), strerror(err)); > } else > - strbuf_addf(&buf, "Unable to create '%s.lock': %s", path, strerror(err)); > + strbuf_addf(&buf, "Unable to create '%s.lock': %s", > + make_nonrelative_path(path), strerror(err)); > return strbuf_detach(&buf, NULL); > } > > -- > 1.6.6.81.gda96d0 -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html