summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 14:25:02 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-25 14:25:02 -0700
commit9bd81e4249a419f9cde8fd68e033e263533f4914 (patch)
tree5a4c77cc648dc720e40c76e83a489ab40e70e187 /wt-status.c
parent450c5aed06ecf60084f993f688b549ffa377b64e (diff)
parentef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff)
downloadgit-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz
Merge branch 'js/config-cb'v1.5.6-rc0
* js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c
index 6e6516cd87..5b4d74c1f3 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -367,7 +367,7 @@ void wt_status_print(struct wt_status *s)
}
}
-int git_status_config(const char *k, const char *v)
+int git_status_config(const char *k, const char *v, void *cb)
{
if (!strcmp(k, "status.submodulesummary")) {
int is_bool;
@@ -391,5 +391,5 @@ int git_status_config(const char *k, const char *v)
wt_status_relative_paths = git_config_bool(k, v);
return 0;
}
- return git_color_default_config(k, v);
+ return git_color_default_config(k, v, cb);
}