Merge branch 'jc/rename-degrade-cc-to-c' into maint

diff --git a/lockfile.c b/lockfile.c
index 6851fa55a503bd24dd204934d7433e306996ce09..c6fb77b26fd88f4edf85a8920a6d72e49551deed 100644 (file)
--- 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));
+                           absolute_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",
+                           absolute_path(path), strerror(err));
        return strbuf_detach(&buf, NULL);
 }