Merge branch 'maint'

diff --git a/cache.h b/cache.h
index 384f829b96a5056d843548c39c4e55976a9a7772..31b0819e83d7f76ed52db7771cf274e74b2156dc 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -179,6 +179,7 @@ extern int refresh_cache(unsigned int flags);
 
 struct lock_file {
        struct lock_file *next;
+       char on_list;
        char filename[PATH_MAX];
 };
 extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);