Merge branch 'bw/grep-recurse-submodules'
"git grep" has been taught to optionally recurse into submodules. * bw/grep-recurse-submodules: grep: search history of moved submodules grep: enable recurse-submodules to work on <tree> objects grep: optionally recurse into submodules grep: add submodules as a grep source type submodules: load gitmodules file from commit sha1 submodules: add helper to determine if a submodule is initialized submodules: add helper to determine if a submodule is populated real_path: canonicalize directory separators in root parts real_path: have callers use real_pathdup and strbuf_realpath real_path: create real_pathdup real_path: convert real_path_internal to strbuf_realpath real_path: resolve symlinks by hand
This commit is contained in:
8
config.c
8
config.c
@ -1236,10 +1236,10 @@ int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_typ
|
||||
return do_config_from(&top, fn, data);
|
||||
}
|
||||
|
||||
static int git_config_from_blob_sha1(config_fn_t fn,
|
||||
const char *name,
|
||||
const unsigned char *sha1,
|
||||
void *data)
|
||||
int git_config_from_blob_sha1(config_fn_t fn,
|
||||
const char *name,
|
||||
const unsigned char *sha1,
|
||||
void *data)
|
||||
{
|
||||
enum object_type type;
|
||||
char *buf;
|
||||
|
||||
Reference in New Issue
Block a user