X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=d5d7fe4f8c66b2fa39a33361b8efae56e3dbf742;hb=021b6e454944a4fba878651ebf9bfe0a3f6c3077;hp=d530af97ccbcdbebcbb82fdcaeebadc66166f104;hpb=dd8239f997962d94162790039b008acb6068a242;p=git.git

diff --git a/cache.h b/cache.h
index d530af97..d5d7fe4f 100644
--- a/cache.h
+++ b/cache.h
@@ -167,13 +167,13 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
 #define REFRESH_IGNORE_MISSING	0x0008	/* ignore non-existent */
 extern int refresh_cache(unsigned int flags);
 
-struct cache_file {
-	struct cache_file *next;
-	char lockfile[PATH_MAX];
+struct lock_file {
+	struct lock_file *next;
+	char filename[PATH_MAX];
 };
-extern int hold_index_file_for_update(struct cache_file *, const char *path);
-extern int commit_index_file(struct cache_file *);
-extern void rollback_index_file(struct cache_file *);
+extern int hold_lock_file_for_update(struct lock_file *, const char *path);
+extern int commit_lock_file(struct lock_file *);
+extern void rollback_lock_file(struct lock_file *);
 
 /* Environment bits from configuration mechanism */
 extern int trust_executable_bit;