diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:19 -0700 |
commit | 693fefe3d022767975eec7585561bfe178b873f4 (patch) | |
tree | 052a0be20d04a5b79f1bc1f166003a33470e5991 /builtin | |
parent | Merge branch 'en/fast-export-fix' (diff) | |
parent | setup: split off a function to handle ordinary .git directories (diff) | |
download | tgif-693fefe3d022767975eec7585561bfe178b873f4.tar.xz |
Merge branch 'jn/maint-setup-fix'
* jn/maint-setup-fix:
setup: split off a function to handle ordinary .git directories
Revert "rehabilitate 'git index-pack' inside the object store"
setup: do not forget working dir from subdir of gitdir
t4111 (apply): refresh index before applying patches to it
setup: split off get_device_or_die helper
setup: split off a function to handle hitting ceiling in repo search
setup: split off code to handle stumbling upon a repository
setup: split off a function to checks working dir for .git file
setup: split off $GIT_DIR-set case from setup_git_directory_gently
tests: try git apply from subdir of toplevel
t1501 (rev-parse): clarify
Conflicts:
builtin/index-pack.c
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/index-pack.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index fad76bf7a8..96333d48cd 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -880,31 +880,17 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) char *index_name_buf = NULL, *keep_name_buf = NULL; struct pack_idx_entry **idx_objects; unsigned char pack_sha1[20]; + int nongit; if (argc == 2 && !strcmp(argv[1], "-h")) usage(index_pack_usage); read_replace_refs = 0; - /* - * 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"); - } + prefix = setup_git_directory_gently(&nongit); + git_config(git_index_pack_config, NULL); + if (prefix && chdir(prefix)) + die("Cannot come back to cwd"); for (i = 1; i < argc; i++) { const char *arg = argv[i]; |