diff options
| author | Nicolas Pitre <nico@cam.org> | 2008-10-21 05:17:07 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-22 00:20:03 +0400 |
| commit | a672ea6ac5a1b876bc7adfe6534b16fa2a32c94b (patch) | |
| tree | 703c03d42003536eab5db4b6e81647ceb86b13d8 | |
| parent | 5610e3b0315d652d6b8e6535afe0e7e461c8a0a0 (diff) | |
rehabilitate 'git index-pack' inside the object store
Before commit d0b92a3f6e it was possible to run 'git index-pack'
directly in the .git/objects/pack/ directory. Restore that ability.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | index-pack.c | 22 | ||||
| -rwxr-xr-x | t/t5302-pack-index.sh | 10 |
2 files changed, 29 insertions, 3 deletions
diff --git a/index-pack.c b/index-pack.c index 2a366206a4..c99a1a152c 100644 --- a/index-pack.c +++ b/index-pack.c @@ -879,10 +879,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]; diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index 6424db1f28..344ab25b8b 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -177,4 +177,14 @@ test_expect_success \ ".git/objects/pack/pack-${pack1}.pack" 2>&1) && echo "$err" | grep "CRC mismatch"' +test_expect_success 'running index-pack in the object store' ' + rm -f .git/objects/pack/* && + cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack && + ( + cd .git/objects/pack + git index-pack pack-${pack1}.pack + ) && + test -f .git/objects/pack/pack-${pack1}.idx +' + test_done |