Merge branch 'jk/pack-bitmap'

diff --git a/lockfile.c b/lockfile.c
index d098adebf1454ea9c9204c9dd2fda4d51b63a1e5..4f16ee78ce3dbc263a762a8800dfe9ddfcfaecd5 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -162,16 +162,6 @@ void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
                            absolute_path(path), strerror(err));
 }
 
-int unable_to_lock_error(const char *path, int err)
-{
-       struct strbuf buf = STRBUF_INIT;
-
-       unable_to_lock_message(path, err, &buf);
-       error("%s", buf.buf);
-       strbuf_release(&buf);
-       return -1;
-}
-
 NORETURN void unable_to_lock_die(const char *path, int err)
 {
        struct strbuf buf = STRBUF_INIT;