X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=255e6b5cc7aa799eee892dcd3632cd0656e6dd1e;hb=dcd0409fc545e881a61f522eb8f1d1a7e814eb94;hp=8dc1de16e4270ed138007be6576259f97c159e2a;hpb=1025fe51bf540bc4c63bce2553a43b1c753e1c40;p=git.git

diff --git a/cache.h b/cache.h
index 8dc1de16e..255e6b5cc 100644
--- a/cache.h
+++ b/cache.h
@@ -165,6 +165,7 @@ extern void rollback_index_file(struct cache_file *);
 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;
@@ -262,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;