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.

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8a975a63902379d09532df79b463d021120a88e8..311fcebaf51034a0788df971749fe80dbc3c8782 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2075,14 +2075,6 @@ status.relativePaths::
        relative to the repository root (this was the default for Git
        prior to v1.5.4).
 
-status.short::
-       Set to true to enable --short by default in linkgit:git-status[1].
-       The option --no-short takes precedence over this variable.
-
-status.branch::
-       Set to true to enable --branch by default in linkgit:git-status[1].
-       The option --no-branch takes precedence over this variable.
-
 status.showUntrackedFiles::
        By default, linkgit:git-status[1] and linkgit:git-commit[1] show
        files which are not currently tracked by Git. Directories which

diff --git a/builtin/commit.c b/builtin/commit.c
index b589ce02ff1d22d349799a8296a93d6bd21e003e..1621dfcd4008fc5853fc078a32bf9eefb6c52023 100644 (file)
--- 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;

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 498332ce0abf6d8cd00d118000cfcf2a81a8a801..e2ffdacc267c22e369247791e24338a20badf94d 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1335,61 +1335,4 @@ test_expect_failure '.git/config ignore=all suppresses submodule summary' '
        git config -f .gitmodules  --remove-section submodule.subname
 '
 
-test_expect_success 'setup of test environment' '
-       git config status.showUntrackedFiles no &&
-       git status -s >expected_short &&
-       git status --no-short >expected_noshort
-'
-
-test_expect_success '"status.short=true" same as "-s"' '
-       git -c status.short=true status >actual &&
-       test_cmp expected_short actual
-'
-
-test_expect_success '"status.short=true" weaker than "--no-short"' '
-       git -c status.short=true status --no-short >actual &&
-       test_cmp expected_noshort actual
-'
-
-test_expect_success '"status.short=false" same as "--no-short"' '
-       git -c status.short=false status >actual &&
-       test_cmp expected_noshort actual
-'
-
-test_expect_success '"status.short=false" weaker than "-s"' '
-       git -c status.short=false status -s >actual &&
-       test_cmp expected_short actual
-'
-
-test_expect_success '"status.branch=true" same as "-b"' '
-       git status -sb >expected_branch &&
-       git -c status.branch=true status -s >actual &&
-       test_cmp expected_branch actual
-'
-
-test_expect_success '"status.branch=true" different from "--no-branch"' '
-       git status -s --no-branch  >expected_nobranch &&
-       git -c status.branch=true status -s >actual &&
-       test_must_fail test_cmp expected_nobranch actual
-'
-
-test_expect_success '"status.branch=true" weaker than "--no-branch"' '
-       git -c status.branch=true status -s --no-branch >actual &&
-       test_cmp expected_nobranch actual
-'
-
-test_expect_success '"status.branch=false" same as "--no-branch"' '
-       git -c status.branch=false status -s >actual &&
-       test_cmp expected_nobranch actual
-'
-
-test_expect_success '"status.branch=false" weaker than "-b"' '
-       git -c status.branch=false status -sb >actual &&
-       test_cmp expected_branch actual
-'
-
-test_expect_success 'Restore default test environment' '
-       git config --unset status.showUntrackedFiles
-'
-
 test_done