Merge branch 'sb/rev-parse-show-superproject-root'

diff --git a/builtin/branch.c b/builtin/branch.c
index b67593288cf54084b569763ba2ef8e3b2cf9aa97..79dc9181fd6c0008d4b8c3b841f35cc1223d6d74 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -93,7 +93,7 @@ static int git_branch_config(const char *var, const char *value, void *cb)
                        return config_error_nonbool(var);
                return color_parse(value, branch_colors[slot]);
        }
-       return git_default_config(var, value, cb);
+       return git_color_default_config(var, value, cb);
 }
 
 static const char *branch_get_color(enum color_branch ix)