ls-files: --others should not say unmerged paths are unknown.

diff --git a/cache.h b/cache.h
index f1d15ab3c9f1006f99c9852b2ce1d1209d986064..677c6acc350155d606e2ba05a9bbf5eb28637a31 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -339,7 +339,8 @@ extern int path_match(const char *path, int nr, char **match);
 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);
+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 +414,5 @@ static inline int sane_case(int x, int high)
        return x;
 }
 
+extern int copy_fd(int ifd, int ofd);
 #endif /* CACHE_H */