diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-06 21:52:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-06 21:52:32 +0300 |
| commit | a1671dd82b5e1c6e837a3f47509a3a33189b0884 (patch) | |
| tree | 7481de8581bc9b94b6059333009e4c155a75dd99 /builtin/fetch.c | |
| parent | 6b55f8b54601c6e6319566875b104d333930bc76 (diff) | |
| parent | 9233887cce8eaebd8469315622b84bd26910351f (diff) | |
Merge branch 'jk/fetch-reflog-df-conflict'
Corner-case bugfixes for "git fetch" around reflog handling.
* jk/fetch-reflog-df-conflict:
ignore stale directories when checking reflog existence
fetch: load all default config at startup
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 6ffd02388b..7b84d35d83 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -68,7 +68,7 @@ static int git_fetch_config(const char *k, const char *v, void *cb) fetch_prune_config = git_config_bool(k, v); return 0; } - return 0; + return git_default_config(k, v, cb); } static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) |