summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-08-05 22:18:53 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-15 20:00:02 -0700
commite0fce074fc4fdf2d2175ff97f1cc3db918ea87e9 (patch)
tree0db6af2c57a630beff6a88974e034f692ad6c6a0 /builtin
parentMerge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix (diff)
downloadtgif-e0fce074fc4fdf2d2175ff97f1cc3db918ea87e9.tar.xz
index-pack: run setup_git_directory_gently() sooner
index-pack already runs a repository search unconditionally; running such a search earlier is not risky and ensures GIT_DIR will be set correctly if the configuration needs to be accessed from run_builtin(). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/index-pack.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 89a1f12d61..e852890862 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -880,12 +880,10 @@ 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);
- prefix = setup_git_directory_gently(&nongit);
git_config(git_index_pack_config, NULL);
if (prefix && chdir(prefix))
die("Cannot come back to cwd");