kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config: move Windows-specific config settings into compat/mingw.c 

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2018-10-30 11:40:06 -07:00 committed by Junio C Hamano
parent 70fc5793df
commit bdfbb0ea93
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cache.h
View File

@ -906,14 +906,6 @@ int use_optional_locks(void);
extern char comment_line_char; extern char comment_line_char;
extern int auto_comment_line_char; extern int auto_comment_line_char;


/* Windows only */
enum hide_dotfiles_type {
HIDE_DOTFILES_FALSE = 0,
HIDE_DOTFILES_TRUE,
HIDE_DOTFILES_DOTGITONLY
};
extern enum hide_dotfiles_type hide_dotfiles;

enum log_refs_config { enum log_refs_config {
LOG_REFS_UNSET = -1, LOG_REFS_UNSET = -1,
LOG_REFS_NONE = 0, LOG_REFS_NONE = 0,

18
compat/mingw.c
View File

@ -6,6 +6,7 @@
#include "../run-command.h" #include "../run-command.h"
#include "../cache.h" #include "../cache.h"
#include "win32/lazyload.h" #include "win32/lazyload.h"
#include "../config.h"


#define HCAST(type, handle) ((type)(intptr_t)handle) #define HCAST(type, handle) ((type)(intptr_t)handle)


@ -203,8 +204,25 @@ static int ask_yes_no_if_possible(const char *format, ...)
} }
} }


/* Windows only */
enum hide_dotfiles_type {
HIDE_DOTFILES_FALSE = 0,
HIDE_DOTFILES_TRUE,
HIDE_DOTFILES_DOTGITONLY
};

static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;

int mingw_core_config(const char *var, const char *value, void *cb) int mingw_core_config(const char *var, const char *value, void *cb)
{ {
if (!strcmp(var, "core.hidedotfiles")) {
if (value && !strcasecmp(value, "dotgitonly"))
hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
else
hide_dotfiles = git_config_bool(var, value);
return 0;
}

return 0; return 0;
} }



8
config.c
View File

@ -1344,14 +1344,6 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
return 0; return 0;
} }


if (!strcmp(var, "core.hidedotfiles")) {
if (value && !strcasecmp(value, "dotgitonly"))
hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
else
hide_dotfiles = git_config_bool(var, value);
return 0;
}

if (!strcmp(var, "core.partialclonefilter")) { if (!strcmp(var, "core.partialclonefilter")) {
return git_config_string(&core_partial_clone_filter_default, return git_config_string(&core_partial_clone_filter_default,
var, value); var, value);

1
environment.c
View File

@ -71,7 +71,6 @@ int core_apply_sparse_checkout;
int merge_log_config = -1; int merge_log_config = -1;
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */ int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
unsigned long pack_size_limit_cfg; unsigned long pack_size_limit_cfg;
enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET; enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET;


#ifndef PROTECT_HFS_DEFAULT #ifndef PROTECT_HFS_DEFAULT