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

Revert "Merge branch 'jg/status-config'"

Browse Source 
This reverts commit 1a22bd31f0, reversing
changes made to 3e7a5b489e.

It makes it impossible to "git commit" when status.short is set, and
also "git status --porcelain" output is affected by status.branch.
This commit is contained in:
Junio C Hamano
2013-06-24 08:18:07 -07:00
parent 1f3a412dfa
commit 908a0e6b98
3 changed files with 0 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/commit.c
View File

@ -1112,17 +1112,6 @@ 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;