diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 23:38:11 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 23:38:11 +0300 |
commit | 1e4bf907890e094f1c1c8c5086387e7d5fdb0655 (patch) | |
tree | 50bf586083db40ec2dc4213110381f73e6d6c9dd /cache.h | |
parent | 7a738b40f67fc44c2a2c1abcffe474241af3d30e (diff) | |
parent | 20b20a22f8f7c1420e259c97ef790cb93091f475 (diff) |
Merge branch 'jk/upload-pack-hook'
"upload-pack" allows a custom "git pack-objects" replacement when
responding to "fetch/clone" via the uploadpack.packObjectsHook.
* jk/upload-pack-hook:
upload-pack: provide a hook for running pack-objects
t1308: do not get fooled by symbolic links to the source tree
config: add a notion of "scope"
config: return configset value for current_config_ functions
config: set up config_source for command-line config
git_config_parse_parameter: refactor cleanup code
git_config_with_options: drop "found" counting
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -1604,6 +1604,16 @@ extern const char *get_log_output_encoding(void); extern const char *get_commit_output_encoding(void); extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data); + +enum config_scope { + CONFIG_SCOPE_UNKNOWN = 0, + CONFIG_SCOPE_SYSTEM, + CONFIG_SCOPE_GLOBAL, + CONFIG_SCOPE_REPO, + CONFIG_SCOPE_CMDLINE, +}; + +extern enum config_scope current_config_scope(void); extern const char *current_config_origin_type(void); extern const char *current_config_name(void); @@ -1696,6 +1706,8 @@ extern int ignore_untracked_cache_config; struct key_value_info { const char *filename; int linenr; + const char *origin_type; + enum config_scope scope; }; extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3))); |