Merge branch 'ps/environ-wo-the-repository'
Code clean-up. * ps/environ-wo-the-repository: (21 commits) environment: stop storing "core.notesRef" globally environment: stop storing "core.warnAmbiguousRefs" globally environment: stop storing "core.preferSymlinkRefs" globally environment: stop storing "core.logAllRefUpdates" globally refs: stop modifying global `log_all_ref_updates` variable branch: stop modifying `log_all_ref_updates` variable repo-settings: track defaults close to `struct repo_settings` repo-settings: split out declarations into a standalone header environment: guard state depending on a repository environment: reorder header to split out `the_repository`-free section environment: move `set_git_dir()` and related into setup layer environment: make `get_git_namespace()` self-contained environment: move object database functions into object layer config: make dependency on repo in `read_early_config()` explicit config: document `read_early_config()` and `read_very_early_config()` environment: make `get_git_work_tree()` accept a repository environment: make `get_graft_file()` accept a repository environment: make `get_index_file()` accept a repository environment: make `get_object_directory()` accept a repository environment: make `get_git_common_dir()` accept a repository ...
This commit is contained in:
4
commit.c
4
commit.c
@ -292,14 +292,14 @@ static int read_graft_file(struct repository *r, const char *graft_file)
|
||||
|
||||
void prepare_commit_graft(struct repository *r)
|
||||
{
|
||||
char *graft_file;
|
||||
const char *graft_file;
|
||||
|
||||
if (r->parsed_objects->commit_graft_prepared)
|
||||
return;
|
||||
if (!startup_info->have_repository)
|
||||
return;
|
||||
|
||||
graft_file = get_graft_file(r);
|
||||
graft_file = repo_get_graft_file(r);
|
||||
read_graft_file(r, graft_file);
|
||||
/* make sure shallows are read */
|
||||
is_repository_shallow(r);
|
||||
|
Reference in New Issue
Block a user