From: Junio C Hamano Date: Tue, 6 Mar 2012 22:53:07 +0000 (-0800) Subject: Merge branch 'jh/threadable-symlink-check' X-Git-Tag: v1.7.10-rc0~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/713194ce54ea67d3fc666ef81aaece16d0e44928?ds=inline;hp=-c Merge branch 'jh/threadable-symlink-check' By Jared Hance * jh/threadable-symlink-check: Add threaded versions of functions in symlinks.c. --- 713194ce54ea67d3fc666ef81aaece16d0e44928 diff --combined cache.h index e12b15f4b9,26ca955dc9..e5e1aa4e15 --- a/cache.h +++ b/cache.h @@@ -950,7 -950,9 +950,9 @@@ struct cache_def extern int has_symlink_leading_path(const char *name, int len); extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int); extern int check_leading_path(const char *name, int len); + extern int threaded_check_leading_path(struct cache_def *cache, const char *name, int len); extern int has_dirs_only_path(const char *name, int len, int prefix_len); + extern int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len); extern void schedule_dir_for_removal(const char *name, int len); extern void remove_scheduled_dirs(void); @@@ -1115,8 -1117,6 +1117,8 @@@ extern int git_config_from_file(config_ extern void git_config_push_parameter(const char *text); extern int git_config_from_parameters(config_fn_t fn, void *data); extern int git_config(config_fn_t fn, void *); +extern int git_config_with_options(config_fn_t fn, void *, + const char *filename, int respect_includes); extern int git_config_early(config_fn_t fn, void *, const char *repo_config); extern int git_parse_ulong(const char *, unsigned long *); extern int git_config_int(const char *, const char *); @@@ -1132,7 -1132,6 +1134,7 @@@ extern int git_config_parse_key(const c extern int git_config_set_multivar(const char *, const char *, const char *, int); extern int git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int); extern int git_config_rename_section(const char *, const char *); +extern int git_config_rename_section_in_file(const char *, const char *, const char *); extern const char *git_etc_gitconfig(void); extern int check_repository_format_version(const char *var, const char *value, void *cb); extern int git_env_bool(const char *, int); @@@ -1143,13 -1142,7 +1145,13 @@@ extern const char *get_commit_output_en extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data); -extern const char *config_exclusive_filename; +struct config_include_data { + int depth; + config_fn_t fn; + void *data; +}; +#define CONFIG_INCLUDE_INIT { 0 } +extern int git_config_include(const char *name, const char *value, void *data); #define MAX_GITNAME (1000) extern char git_default_email[MAX_GITNAME]; @@@ -1187,7 -1180,6 +1189,7 @@@ extern const char *pager_program extern int pager_in_use(void); extern int pager_use_color; extern int term_columns(void); +extern int decimal_width(int); extern const char *editor_program; extern const char *askpass_program;