Skip to content

Commit

Permalink
move git_default_* variables to ident.c
Browse files Browse the repository at this point in the history
There's no reason anybody outside of ident.c should access
these directly (they should use the new accessors which make
sure the variables are initialized), so we can make them
file-scope statics.

While we're at it, move user_ident_explicitly_given into
ident.c; while still globally visible, it makes more sense
to reside with the ident code.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
peff authored and gitster committed May 22, 2012
1 parent 9597921 commit 2d4b4fc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
3 changes: 0 additions & 3 deletions cache.h
Expand Up @@ -1142,9 +1142,6 @@ struct config_include_data {
#define CONFIG_INCLUDE_INIT { 0 }
extern int git_config_include(const char *name, const char *value, void *data);

#define MAX_GITNAME (1000)
extern char git_default_email[MAX_GITNAME];
extern char git_default_name[MAX_GITNAME];
#define IDENT_NAME_GIVEN 01
#define IDENT_MAIL_GIVEN 02
#define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN)
Expand Down
3 changes: 0 additions & 3 deletions environment.c
Expand Up @@ -11,9 +11,6 @@
#include "refs.h"
#include "fmt-merge-msg.h"

char git_default_email[MAX_GITNAME];
char git_default_name[MAX_GITNAME];
int user_ident_explicitly_given;
int trust_executable_bit = 1;
int trust_ctime = 1;
int has_symlinks = 1;
Expand Down
4 changes: 4 additions & 0 deletions ident.c
Expand Up @@ -7,7 +7,11 @@
*/
#include "cache.h"

#define MAX_GITNAME (1000)
static char git_default_name[MAX_GITNAME];
static char git_default_email[MAX_GITNAME];
static char git_default_date[50];
int user_ident_explicitly_given;

#ifdef NO_GECOS_IN_PWENT
#define get_gecos(ignored) "&"
Expand Down

0 comments on commit 2d4b4fc

Please sign in to comment.