Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 8bf42e529db4ee888b749a476384f939573002b1..2e24b5c330e8eb17a8755e9b47fa3c66810981d3 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -554,7 +554,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
                return 0;
        }
 
-       return git_default_config(var, value, cb);
+       return git_color_default_config(var, value, cb);
 }
 
 static int omit_in_dense(struct commit *commit, struct commit **rev, int n)