Git fork

server-info.h: move declarations for server-info.c functions from cache.h

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Elijah Newren and committed by
Junio C Hamano
623b80be 0ff73d74

+12 -4
+1
builtin/receive-pack.c
··· 33 33 #include "object-store.h" 34 34 #include "protocol.h" 35 35 #include "commit-reach.h" 36 + #include "server-info.h" 36 37 #include "trace.h" 37 38 #include "trace2.h" 38 39 #include "worktree.h"
+1
builtin/repack.c
··· 7 7 #include "hex.h" 8 8 #include "parse-options.h" 9 9 #include "run-command.h" 10 + #include "server-info.h" 10 11 #include "sigchain.h" 11 12 #include "strbuf.h" 12 13 #include "string-list.h"
+1
builtin/update-server-info.c
··· 3 3 #include "builtin.h" 4 4 #include "gettext.h" 5 5 #include "parse-options.h" 6 + #include "server-info.h" 6 7 7 8 static const char * const update_server_info_usage[] = { 8 9 "git update-server-info [-f | --force]",
-3
cache.h
··· 593 593 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2); 594 594 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2); 595 595 596 - /* Dumb servers support */ 597 - int update_server_info(int); 598 - 599 596 #define COPY_READ_ERROR (-2) 600 597 #define COPY_WRITE_ERROR (-3) 601 598 int copy_fd(int ifd, int ofd);
+2 -1
server-info.c
··· 1 - #include "cache.h" 1 + #include "git-compat-util.h" 2 2 #include "alloc.h" 3 3 #include "dir.h" 4 4 #include "environment.h" ··· 11 11 #include "packfile.h" 12 12 #include "object-file.h" 13 13 #include "object-store.h" 14 + #include "server-info.h" 14 15 #include "strbuf.h" 15 16 #include "wrapper.h" 16 17
+7
server-info.h
··· 1 + #ifndef SERVER_INFO_H 2 + #define SERVER_INFO_H 3 + 4 + /* Dumb servers support */ 5 + int update_server_info(int); 6 + 7 + #endif /* SERVER_INFO_H */