diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:31 -0700 |
| commit | 633142d86874ee8ce79a23ee4346f32e6271faad (patch) | |
| tree | 8096e26f84075d3aae42d13fe0b76c2a5f2ea07c /builtin/index-pack.c | |
| parent | 693fefe3d022767975eec7585561bfe178b873f4 (diff) | |
| parent | 41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd (diff) | |
| download | git-633142d86874ee8ce79a23ee4346f32e6271faad.tar.gz | |
Merge branch 'jn/paginate-fix'
* jn/paginate-fix:
t7006 (pager): add missing TTY prerequisites
merge-file: run setup_git_directory_gently() sooner
var: run setup_git_directory_gently() sooner
ls-remote: run setup_git_directory_gently() sooner
index-pack: run setup_git_directory_gently() sooner
config: run setup_git_directory_gently() sooner
bundle: run setup_git_directory_gently() sooner
apply: run setup_git_directory_gently() sooner
grep: run setup_git_directory_gently() sooner
shortlog: run setup_git_directory_gently() sooner
git wrapper: allow setup_git_directory_gently() be called earlier
setup: remember whether repository was found
git wrapper: introduce startup_info struct
Conflicts:
builtin/index-pack.c
Diffstat (limited to 'builtin/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 96333d48cd..2e680d7a7a 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -880,14 +880,12 @@ 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; - prefix = setup_git_directory_gently(&nongit); git_config(git_index_pack_config, NULL); if (prefix && chdir(prefix)) die("Cannot come back to cwd"); |