From: Nguyễn Thái Ngọc Duy Date: Mon, 05 Apr 2010 18:41:06 GMT Subject: [PATCH 21/43] index-pack: use RUN_SETUP_GENTLY Message-ID: <1270492888-26589-22-git-send-email-pclouds@gmail.com> In-Reply-To: <1270492888-26589-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/index-pack.c | 2 -- git.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 2a6359d..9aa6a13 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -879,7 +879,6 @@ 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); @@ -889,7 +888,6 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) * 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. */ - prefix = setup_git_directory_gently(&nongit); git_config(git_index_pack_config, NULL); if (prefix && chdir(prefix)) die("Cannot come back to cwd"); diff --git a/git.c b/git.c index 96c2d21..fac3d1c 100644 --- a/git.c +++ b/git.c @@ -332,7 +332,7 @@ static void handle_internal_command(int argc, const char **argv) { "grep", cmd_grep, RUN_SETUP_GENTLY | USE_PAGER }, { "hash-object", cmd_hash_object, RUN_SETUP_GENTLY }, { "help", cmd_help }, - { "index-pack", cmd_index_pack }, + { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY }, { "init", cmd_init_db }, { "init-db", cmd_init_db }, { "log", cmd_log, RUN_SETUP | USE_PAGER }, -- 1.7.0.rc1.541.g2da82.dirty