mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tb/config-default'

Browse Source 
"git config --get" learned the "--default" option, to help the
calling script.  Building on top of the tb/config-type topic, the
"git config" learns "--type=color" type.  Taken together, you can
do things like "git config --get foo.color --default blue" and get
the ANSI color sequence for the color given to foo.color variable,
or "blue" if the variable does not exist.

* tb/config-default:
  builtin/config: introduce `color` type specifier
  config.c: introduce 'git_config_color' to parse ANSI colors
  builtin/config: introduce `--default`
This commit is contained in:
Junio C Hamano
2018-05-08 15:59:27 +09:00
parent e3e042b185 63e2a0f8e9
commit 00bb99c424
6 changed files with 127 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config.c
View File

@ -16,6 +16,7 @@
#include "string-list.h"
#include "utf8.h"
#include "dir.h"
#include "color.h"
struct config_source {
struct config_source *prev;
@ -1067,6 +1068,15 @@ int git_config_expiry_date(timestamp_t *timestamp, const char *var, const char *
return 0;
}
int git_config_color(char *dest, const char *var, const char *value)
{
if (!value)
return config_error_nonbool(var);
if (color_parse(value, dest) < 0)
return -1;
return 0;
}
static int git_default_core_config(const char *var, const char *value)
{
/* This needs a better name */