X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=cache.h;h=255e6b5cc7aa799eee892dcd3632cd0656e6dd1e;hb=dcd0409fc545e881a61f522eb8f1d1a7e814eb94;hp=3af6b868e86032af59ce31c3cbe714b7e5a0ee25;hpb=f67b45f862d17b54037b9b59eefc385624d1fa83;p=git.git

diff --git a/cache.h b/cache.h
index 3af6b868e..255e6b5cc 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;