Merge branch 'jk/apache-test-for-2.4'

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