Merge branch 'maint-1.7.6' into maint

[git.git] / builtin / show-branch.c

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 4b726fabde153ad0e203e986a9070cf144f1cbaf..4b480d7c7ca6c6258a5cd82cfc88df62cd0d218f 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -685,9 +685,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 
        git_config(git_show_branch_config, NULL);
 
-       if (showbranch_use_color == -1)
-               showbranch_use_color = git_use_color_default;
-
        /* If nothing is specified, try the default first */
        if (ac == 1 && default_num) {
                ac = default_num;