OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cat-file doc: document that -e will return some output
[git-core/git.git]
/
color.c
diff --git
a/color.c
b/color.c
index
7aa8b07
..
9a9261a
100644
(file)
--- a/
color.c
+++ b/
color.c
@@
-338,6
+338,13
@@
static int check_auto_color(void)
int want_color(int var)
{
int want_color(int var)
{
+ /*
+ * NEEDSWORK: This function is sometimes used from multiple threads, and
+ * we end up using want_auto racily. That "should not matter" since
+ * we always write the same value, but it's still wrong. This function
+ * is listed in .tsan-suppressions for the time being.
+ */
+
static int want_auto = -1;
if (var < 0)
static int want_auto = -1;
if (var < 0)
@@
-361,6
+368,14
@@
int git_color_config(const char *var, const char *value, void *cb)
return 0;
}
return 0;
}
+int git_color_default_config(const char *var, const char *value, void *cb)
+{
+ if (git_color_config(var, value, cb) < 0)
+ return -1;
+
+ return git_default_config(var, value, cb);
+}
+
void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb)
{
if (*color)
void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb)
{
if (*color)