summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-16 02:58:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-16 02:59:48 (GMT)
commitfc196b68905958dac66e1baaa3b66b84a2cdacfc (patch)
treeefccd657eb978e810efee668522ce27ddd163f8b /builtin
parent3ba7e6e29afd67e69ff5963d8ed76728824959a0 (diff)
parent3f8099fce7779631fe8827a8979d7b57629a36de (diff)
downloadgit-fc196b68905958dac66e1baaa3b66b84a2cdacfc.zip
git-fc196b68905958dac66e1baaa3b66b84a2cdacfc.tar.gz
git-fc196b68905958dac66e1baaa3b66b84a2cdacfc.tar.bz2
Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix
* 'jn/maint-setup-fix' (early part): 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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/index-pack.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a89ae83..89a1f12 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -880,29 +880,15 @@ 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);
- /*
- * 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];