From 1b018fd9be290fd6a70ce3093ab1dc1abce74e00 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 27 Sep 2009 01:15:09 +0200 Subject: git branch -D: give a better error message when lockfile creation fails Previously the old error message just told the user that it was not possible to delete the ref from the packed-refs file. Give instructions on how to resolve the problem. Signed-off-by: Miklos Vajna Signed-off-by: Jeff King Signed-off-by: Shawn O. Pearce --- refs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'refs.c') diff --git a/refs.c b/refs.c index 24865cf5a6..808f56bb27 100644 --- a/refs.c +++ b/refs.c @@ -972,8 +972,10 @@ static int repack_without_ref(const char *refname) if (!found) return 0; fd = hold_lock_file_for_update(&packlock, git_path("packed-refs"), 0); - if (fd < 0) + if (fd < 0) { + unable_to_lock_error(git_path("packed-refs"), errno); return error("cannot delete '%s' from packed refs", refname); + } for (list = packed_ref_list; list; list = list->next) { char line[PATH_MAX + 100]; -- cgit v1.2.1