mailmap, quote: move declarations of global vars to correct unit
Since earlier commits removed the inclusion of cache.h from mailmap.c and quote.c, it feels odd to have the extern declarations of global variables in cache.h rather than the actual header included by the source file. Move these global variable extern declarations from cache.h to mailmap.c and quote.c. Signed-off-by: Elijah Newren <newren@gmail.com> Acked-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b7b189cd5a
commit
4711556905
5
cache.h
5
cache.h
@ -599,8 +599,6 @@ void set_alternate_index_output(const char *);
|
||||
extern int verify_index_checksum;
|
||||
extern int verify_ce_order;
|
||||
|
||||
extern int quote_path_fully;
|
||||
|
||||
#define MTIME_CHANGED 0x0001
|
||||
#define CTIME_CHANGED 0x0002
|
||||
#define OWNER_CHANGED 0x0004
|
||||
@ -655,9 +653,6 @@ struct pack_entry {
|
||||
/* Dumb servers support */
|
||||
int update_server_info(int);
|
||||
|
||||
extern const char *git_mailmap_file;
|
||||
extern const char *git_mailmap_blob;
|
||||
|
||||
#define COPY_READ_ERROR (-2)
|
||||
#define COPY_WRITE_ERROR (-3)
|
||||
int copy_fd(int ifd, int ofd);
|
||||
|
1
config.c
1
config.c
@ -18,6 +18,7 @@
|
||||
#include "ident.h"
|
||||
#include "repository.h"
|
||||
#include "lockfile.h"
|
||||
#include "mailmap.h"
|
||||
#include "exec-cmd.h"
|
||||
#include "strbuf.h"
|
||||
#include "quote.h"
|
||||
|
@ -3,6 +3,9 @@
|
||||
|
||||
struct string_list;
|
||||
|
||||
extern const char *git_mailmap_file;
|
||||
extern const char *git_mailmap_blob;
|
||||
|
||||
int read_mailmap(struct string_list *map);
|
||||
void clear_mailmap(struct string_list *map);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user