diff options
author | Miklos Vajna <vmiklos@frugalware.org> | 2009-09-27 01:15:09 +0200 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2009-09-29 08:14:47 -0700 |
commit | 1b018fd9be290fd6a70ce3093ab1dc1abce74e00 (patch) | |
tree | 4961e8dec3da9cd76e3d79b57c24c3cdf97d2c35 /refs.c | |
parent | 6bbfd1fa98b0c1fa1684bd35e64404799f0cc2b3 (diff) | |
download | git-1b018fd9be290fd6a70ce3093ab1dc1abce74e00.tar.gz git-1b018fd9be290fd6a70ce3093ab1dc1abce74e00.tar.xz |
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 <vmiklos@frugalware.org>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'refs.c')
-rw-r--r-- | refs.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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]; |