travis-ci: record and skip successfully built trees

diff --git a/builtin/branch.c b/builtin/branch.c
index 036fdc9298ab2b4b9d0e2cd42ea7ce5d89212365..16d391b407c9fa688b48a3e28f77800dcc1e2e0c 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -92,7 +92,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_color_default_config(var, value, cb);
+       return git_default_config(var, value, cb);
 }
 
 static const char *branch_get_color(enum color_branch ix)
@@ -409,6 +409,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
 
        if (!format->format)
                format->format = to_free = build_format(filter, maxwidth, remote_prefix);
+       format->use_color = branch_use_color;
 
        if (verify_ref_format(format))
                die(_("unable to parse format string"));