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

Merge branch 'maint'

Browse Source 
* maint:
  GIT 1.6.0.3
  rehabilitate 'git index-pack' inside the object store
This commit is contained in:
Junio C Hamano
2008-10-21 13:47:22 -07:00
parent 208f689610 031e6c898f
commit 20341dd970
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
index-pack.c
View File

@ -880,10 +880,26 @@ int main(int argc, char **argv)
char *index_name_buf = NULL, *keep_name_buf = NULL;
struct pack_idx_entry **idx_objects;
unsigned char pack_sha1[20];
int nongit = 0;
setup_git_directory_gently(&nongit);
git_config(git_index_pack_config, NULL);
/*
* We wish to read the repository's config file if any, and
* for that it is necessary to call setup_git_directory_gently().
* However if the cwd was inside .git/objects/pack/ then we need
* to go back there or all the pack name arguments will be wrong.
* And in that case we cannot rely on any prefix returned by
* setup_git_directory_gently() either.
*/
{
char cwd[PATH_MAX+1];
int nongit;
if (!getcwd(cwd, sizeof(cwd)-1))
die("Unable to get current working directory");
setup_git_directory_gently(&nongit);
git_config(git_index_pack_config, NULL);
if (chdir(cwd))
die("Cannot come back to cwd");
}
for (i = 1; i < argc; i++) {
char *arg = argv[i];