Merge branch 'jg/status-config'
"git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * jg/status-config: status: introduce status.branch to enable --branch by default status: introduce status.short to enable --short by default
This commit is contained in:
@ -1112,6 +1112,17 @@ static int git_status_config(const char *k, const char *v, void *cb)
|
||||
s->submodule_summary = -1;
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(k, "status.short")) {
|
||||
if (git_config_bool(k, v))
|
||||
status_format = STATUS_FORMAT_SHORT;
|
||||
else
|
||||
status_format = STATUS_FORMAT_NONE;
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(k, "status.branch")) {
|
||||
s->show_branch = git_config_bool(k, v);
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
|
||||
s->use_color = git_config_colorbool(k, v);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user