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
This commit is contained in:
@ -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)
|
||||
|
Reference in New Issue
Block a user