undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mailmap, quote: move declarations of global vars to correct unit

Browse Source 
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:
Elijah Newren 2023-04-11 00:42:04 -07:00 committed by Junio C Hamano
parent b7b189cd5a
commit 4711556905
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cache.h
View File

@ -599,8 +599,6 @@ void set_alternate_index_output(const char *);
extern int verify_index_checksum; extern int verify_index_checksum;
extern int verify_ce_order; extern int verify_ce_order;
extern int quote_path_fully;
#define MTIME_CHANGED 0x0001 #define MTIME_CHANGED 0x0001
#define CTIME_CHANGED 0x0002 #define CTIME_CHANGED 0x0002
#define OWNER_CHANGED 0x0004 #define OWNER_CHANGED 0x0004
@ -655,9 +653,6 @@ struct pack_entry {
/* Dumb servers support */ /* Dumb servers support */
int update_server_info(int); int update_server_info(int);
extern const char *git_mailmap_file;
extern const char *git_mailmap_blob;
#define COPY_READ_ERROR (-2) #define COPY_READ_ERROR (-2)
#define COPY_WRITE_ERROR (-3) #define COPY_WRITE_ERROR (-3)
int copy_fd(int ifd, int ofd); int copy_fd(int ifd, int ofd);

1
config.c
View File

@ -18,6 +18,7 @@
#include "ident.h" #include "ident.h"
#include "repository.h" #include "repository.h"
#include "lockfile.h" #include "lockfile.h"
#include "mailmap.h"
#include "exec-cmd.h" #include "exec-cmd.h"
#include "strbuf.h" #include "strbuf.h"
#include "quote.h" #include "quote.h"

3
mailmap.h
View File

@ -3,6 +3,9 @@
struct string_list; struct string_list;
extern const char *git_mailmap_file;
extern const char *git_mailmap_blob;
int read_mailmap(struct string_list *map); int read_mailmap(struct string_list *map);
void clear_mailmap(struct string_list *map); void clear_mailmap(struct string_list *map);

2
quote.h
View File

@ -3,6 +3,8 @@
struct strbuf; struct strbuf;
extern int quote_path_fully;
/* Help to copy the thing properly quoted for the shell safety. /* Help to copy the thing properly quoted for the shell safety.
* any single quote is replaced with '\'', any exclamation point * any single quote is replaced with '\'', any exclamation point
* is replaced with '\!', and the whole thing is enclosed in a * is replaced with '\!', and the whole thing is enclosed in a