X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=255e6b5cc7aa799eee892dcd3632cd0656e6dd1e;hb=384e99a4a99820c34fe3600b2aad3f0185dd43db;hp=58eec00e0ed1d2c20c51d3973d7463ccef0afb26;hpb=6be65bbc958e8d7c57bc81ae7035119b8b1afbab;p=git.git

diff --git a/cache.h b/cache.h
index 58eec00e..255e6b5c 100644
--- a/cache.h
+++ b/cache.h
@@ -161,11 +161,14 @@ 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 *);
 
+/* Environment bits from configuration mechanism */
 extern int trust_executable_bit;
 extern int assume_unchanged;
 extern int only_use_symrefs;
+extern int warn_ambiguous_refs;
 extern int diff_rename_limit_default;
 extern int shared_repository;
+extern const char *apply_default_whitespace;
 
 #define GIT_REPO_VERSION 0
 extern int repository_format_version;
@@ -260,7 +263,7 @@ struct checkout {
 		 refresh_cache:1;
 };
 
-extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
+extern int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath);
 
 extern struct alternate_object_database {
 	struct alternate_object_database *next;
@@ -352,4 +355,7 @@ extern int copy_fd(int ifd, int ofd);
 extern int receive_unpack_pack(int fd[2], const char *me, int quiet);
 extern int receive_keep_pack(int fd[2], const char *me, int quiet);
 
+/* pager.c */
+extern void setup_pager(void);
+
 #endif /* CACHE_H */