summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2009-02-19 12:54:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-20 07:22:57 (GMT)
commite43a6fd3e94888d76779ad79fb568ed180e5fcdf (patch)
tree10ebfaf701f9a4b8a0f9f72db9a33bda4c461653 /cache.h
parentb452cc16d85ea9de7d3f15c83a917b5534a91120 (diff)
downloadgit-e43a6fd3e94888d76779ad79fb568ed180e5fcdf.zip
git-e43a6fd3e94888d76779ad79fb568ed180e5fcdf.tar.gz
git-e43a6fd3e94888d76779ad79fb568ed180e5fcdf.tar.bz2
More friendly message when locking the index fails.
Just saying that index.lock exists doesn't tell the user _what_ to do to fix the problem. We should give an indication that it's normally safe to delete index.lock after making sure git isn't running here. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 3a33b1e..0e2f219 100644
--- a/cache.h
+++ b/cache.h
@@ -484,6 +484,7 @@ struct lock_file {
};
#define LOCK_DIE_ON_ERROR 1
#define LOCK_NODEREF 2
+extern NORETURN void unable_to_lock_index_die(const char *path, int err);
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
extern int commit_lock_file(struct lock_file *);