summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-24 15:18:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-24 15:18:07 (GMT)
commit908a0e6b98e5a7c4b299b3643823bdefb4fa512e (patch)
treebf2121d7fd055264b4d1504283aebed64c13552f /builtin/commit.c
parent1f3a412dfaf2d12583e3286c6d20b403da8cc963 (diff)
downloadgit-908a0e6b98e5a7c4b299b3643823bdefb4fa512e.zip
git-908a0e6b98e5a7c4b299b3643823bdefb4fa512e.tar.gz
git-908a0e6b98e5a7c4b299b3643823bdefb4fa512e.tar.bz2
Revert "Merge branch 'jg/status-config'"
This reverts commit 1a22bd31f0a5130ce6c934951a5526ceb774c2be, reversing changes made to 3e7a5b489e45ae8a3a0b222893d58b172d883136. It makes it impossible to "git commit" when status.short is set, and also "git status --porcelain" output is affected by status.branch.
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index b589ce0..1621dfc 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -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;