apply: allow-binary-replacement.

diff --git a/cache.h b/cache.h
index d776016822a8fed78358c7dccc334ee576302a36..08461cfc5a71b8c43f4774de0da897ed2aa3e6ad 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -179,6 +179,8 @@ extern int commit_index_file(struct cache_file *);
 extern void rollback_index_file(struct cache_file *);
 
 extern int trust_executable_bit;
+extern int only_use_symrefs;
+extern int diff_rename_limit_default;
 
 #define MTIME_CHANGED  0x0001
 #define CTIME_CHANGED  0x0002
@@ -340,6 +342,7 @@ extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
                      int nr_refspec, char **refspec, int all);
 extern int get_ack(int fd, unsigned char *result_sha1);
 extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, int ignore_funny);
+extern int server_supports(const char *feature);
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1);
 extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
@@ -413,4 +416,5 @@ static inline int sane_case(int x, int high)
        return x;
 }
 
+extern int copy_fd(int ifd, int ofd);
 #endif /* CACHE_H */