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>
Elijah Newren committed
Apr 11, 2023 at 00:42 UTC
4711556905f381c01f1fbae205f67cfa673ab44a
4 files changed
+6
-5
cache.h
-5
@@ -599,8 +599,6 @@ void set_alternate_index_output(const char *);
599
extern int verify_index_checksum;
600
extern int verify_ce_order;
601
602
-extern int quote_path_fully;
603
-
602
#define MTIME_CHANGED 0x0001
603
#define CTIME_CHANGED 0x0002
604
#define OWNER_CHANGED 0x0004
@@ -655,9 +653,6 @@ struct pack_entry {
653
/* Dumb servers support */
654
int update_server_info(int);
655
658
-extern const char *git_mailmap_file;
659
-extern const char *git_mailmap_blob;
660
-
656
#define COPY_READ_ERROR (-2)
657
#define COPY_WRITE_ERROR (-3)
658
int copy_fd(int ifd, int ofd);
config.c
+1
@@ -18,6 +18,7 @@
18
#include "ident.h"
19
#include "repository.h"
20
#include "lockfile.h"
21
+#include "mailmap.h"
22
#include "exec-cmd.h"
23
#include "strbuf.h"
24
#include "quote.h"
mailmap.h
+3
@@ -3,6 +3,9 @@
3
4
struct string_list;
5
6
+extern const char *git_mailmap_file;
7
+extern const char *git_mailmap_blob;
8
+
9
int read_mailmap(struct string_list *map);
10
void clear_mailmap(struct string_list *map);
11
quote.h
+2
@@ -3,6 +3,8 @@
3
4
struct strbuf;
5
6
+extern int quote_path_fully;
7
+
8
/* Help to copy the thing properly quoted for the shell safety.
9
* any single quote is replaced with '\'', any exclamation point
10
* is replaced with '\!', and the whole thing is enclosed in a