From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Aug 2010 23:23:31 +0000 (-0700)
Subject: Merge branch 'jn/paginate-fix'
X-Git-Tag: v1.7.3-rc0~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=633142d86874ee8ce79a23ee4346f32e6271faad;p=git.git

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
---

633142d86874ee8ce79a23ee4346f32e6271faad
diff --cc builtin/grep.c
index b725ede0f,ca56c5b00..da32f3df3
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@@ -834,12 -834,12 +834,12 @@@ int cmd_grep(int argc, const char **arg
  	int external_grep_allowed__ignored;
  	const char *show_in_pager = NULL, *default_pager = "dummy";
  	struct grep_opt opt;
 -	struct object_array list = { 0, 0, NULL };
 +	struct object_array list = OBJECT_ARRAY_INIT;
  	const char **paths = NULL;
 -	struct string_list path_list = { NULL, 0, 0, 0 };
 +	struct string_list path_list = STRING_LIST_INIT_NODUP;
  	int i;
  	int dummy;
- 	int nongit = 0, use_index = 1;
+ 	int use_index = 1;
  	struct option options[] = {
  		OPT_BOOLEAN(0, "cached", &cached,
  			"search in index instead of in the work tree"),
diff --cc builtin/index-pack.c
index 96333d48c,e85289086..2e680d7a7
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@@ -885,9 -884,6 +884,8 @@@ int cmd_index_pack(int argc, const cha
  	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");
diff --cc cache.h
index eb77e1df4,f9e82a8ac..733d4d1c8
--- a/cache.h
+++ b/cache.h
@@@ -1099,9 -1096,13 +1099,15 @@@ void overlay_tree_on_cache(const char *
  
  char *alias_lookup(const char *alias);
  int split_cmdline(char *cmdline, const char ***argv);
 +/* Takes a negative value returned by split_cmdline */
 +const char *split_cmdline_strerror(int cmdline_errno);
  
+ /* git.c */
+ struct startup_info {
+ 	int have_repository;
+ };
+ extern struct startup_info *startup_info;
+ 
  /* builtin/merge.c */
  int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
  
diff --cc git.c
index 12d2952e0,286a3595a..8de48107e
--- a/git.c
+++ b/git.c
@@@ -331,16 -336,16 +337,16 @@@ static void handle_internal_command(in
  		{ "fsck-objects", cmd_fsck, RUN_SETUP },
  		{ "gc", cmd_gc, RUN_SETUP },
  		{ "get-tar-commit-id", cmd_get_tar_commit_id },
- 		{ "grep", cmd_grep },
+ 		{ "grep", cmd_grep, RUN_SETUP_GENTLY },
  		{ "hash-object", cmd_hash_object },
  		{ "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 },
 +		{ "log", cmd_log, RUN_SETUP },
  		{ "ls-files", cmd_ls_files, RUN_SETUP },
  		{ "ls-tree", cmd_ls_tree, RUN_SETUP },
- 		{ "ls-remote", cmd_ls_remote },
+ 		{ "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY },
  		{ "mailinfo", cmd_mailinfo },
  		{ "mailsplit", cmd_mailsplit },
  		{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
@@@ -379,9 -384,9 +385,9 @@@
  		{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
  		{ "rm", cmd_rm, RUN_SETUP },
  		{ "send-pack", cmd_send_pack, RUN_SETUP },
- 		{ "shortlog", cmd_shortlog, USE_PAGER },
+ 		{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
  		{ "show-branch", cmd_show_branch, RUN_SETUP },
 -		{ "show", cmd_show, RUN_SETUP | USE_PAGER },
 +		{ "show", cmd_show, RUN_SETUP },
  		{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
  		{ "stripspace", cmd_stripspace },
  		{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
@@@ -393,10 -398,10 +399,10 @@@
  		{ "update-ref", cmd_update_ref, RUN_SETUP },
  		{ "update-server-info", cmd_update_server_info, RUN_SETUP },
  		{ "upload-archive", cmd_upload_archive },
- 		{ "var", cmd_var },
+ 		{ "var", cmd_var, RUN_SETUP_GENTLY },
  		{ "verify-tag", cmd_verify_tag, RUN_SETUP },
  		{ "version", cmd_version },
 -		{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
 +		{ "whatchanged", cmd_whatchanged, RUN_SETUP },
  		{ "write-tree", cmd_write_tree, RUN_SETUP },
  		{ "verify-pack", cmd_verify_pack },
  		{ "show-ref", cmd_show_ref, RUN_SETUP },
diff --cc setup.c
index d19aa7d7a,6ee1e28bd..a3b76de2b
--- a/setup.c
+++ b/setup.c
@@@ -505,8 -482,34 +505,18 @@@ static const char *setup_git_directory_
  			die_errno("Cannot change to '%s/..'", cwd);
  		}
  	}
 -
 -	inside_git_dir = 0;
 -	if (!work_tree_env)
 -		inside_work_tree = 1;
 -	root_len = offset_1st_component(cwd);
 -	git_work_tree_cfg = xstrndup(cwd, offset > root_len ? offset : root_len);
 -	if (check_repository_format_gently(nongit_ok))
 -		return NULL;
 -	if (offset == len)
 -		return NULL;
 -
 -	/* Make "offset" point to past the '/', and add a '/' at the end */
 -	offset++;
 -	cwd[len++] = '/';
 -	cwd[len] = 0;
 -	return cwd + offset;
  }
  
+ const char *setup_git_directory_gently(int *nongit_ok)
+ {
+ 	const char *prefix;
+ 
+ 	prefix = setup_git_directory_gently_1(nongit_ok);
+ 	if (startup_info)
+ 		startup_info->have_repository = !nongit_ok || !*nongit_ok;
+ 	return prefix;
+ }
+ 
  int git_config_perm(const char *var, const char *value)
  {
  	int i;