mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/object-store-grafts' into sb/object-store-lookup

Browse Source 
* sb/object-store-grafts:
  commit: allow lookup_commit_graft to handle arbitrary repositories
  commit: allow prepare_commit_graft to handle arbitrary repositories
  shallow: migrate shallow information into the object parser
  path.c: migrate global git_path_* to take a repository argument
  cache: convert get_graft_file to handle arbitrary repositories
  commit: convert read_graft_file to handle arbitrary repositories
  commit: convert register_commit_graft to handle arbitrary repositories
  commit: convert commit_graft_pos() to handle arbitrary repositories
  shallow: add repository argument to is_repository_shallow
  shallow: add repository argument to check_shallow_file_for_update
  shallow: add repository argument to register_shallow
  shallow: add repository argument to set_alternate_shallow_file
  commit: add repository argument to lookup_commit_graft
  commit: add repository argument to prepare_commit_graft
  commit: add repository argument to read_graft_file
  commit: add repository argument to register_commit_graft
  commit: add repository argument to commit_graft_pos
  object: move grafts to object parser
  object-store: move object access functions to object-store.h
This commit is contained in:
Junio C Hamano
2018-06-29 10:24:33 -07:00
parent e3331758f1 b9dbddf6da
commit b16b60f71b
95 changed files with 463 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
environment.c
View File

@ -192,7 +192,7 @@ void setup_git_env(const char *git_dir)
git_namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
shallow_file = getenv(GIT_SHALLOW_FILE_ENVIRONMENT);
if (shallow_file)
set_alternate_shallow_file(shallow_file, 0);
set_alternate_shallow_file(the_repository, shallow_file, 0);
}
int is_bare_repository(void)
@ -319,11 +319,11 @@ char *get_index_file(void)
return the_repository->index_file;
}
char *get_graft_file(void)
char *get_graft_file(struct repository *r)
{
if (!the_repository->graft_file)
if (!r->graft_file)
BUG("git environment hasn't been setup");
return the_repository->graft_file;
return r->graft_file;
}
static void set_git_dir_1(const char *path)