git wrapper: allow setup_git_directory_gently() be called earlier

In the spirit of v1.4.2-rc3~34^2^2 (Call setup_git_directory() much earlier, 2006-07-28), let run_builtin() take care of searching for a repository for built-ins that want to make use of one if present. So now you can mark your command with RUN_SETUP_GENTLY and use nongit = !startup_info->have_repository; in place of prefix = setup_git_directory_gently(&nongit); and everything will be the same, except the repository is discovered a little sooner. As v1.7.2~16^2 (2010-07-14) explains, this should allow more commands to robustly use features like "git --paginate" that look at local configuration before the command is actually run. This patch sets up the infrastructure. Later patches will teach particular commands to use it. 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>

Nguyễn Thái Ngọc Duy committed Aug 5, 2010 at 21:52 UTC ee38dfb89ef88a3e4e6818b7cfe31d122a1c640d

1 file changed +9 -4

git.c

+9 -4

@@ -230,13 +230,14 @@ static int handle_alias(int *argcp, const char ***argv)

230

231 const char git_version_string[] = GIT_VERSION;

232

233 -#define RUN_SETUP (1<<0)

234 -#define USE_PAGER (1<<1)

233 +#define RUN_SETUP (1<<0)

234 +#define RUN_SETUP_GENTLY (1<<1)

235 +#define USE_PAGER (1<<2)

236 /*

237 * require working tree to be present -- anything uses this needs

238 * RUN_SETUP for reading from the configuration file.

239 */

239 -#define NEED_WORK_TREE (1<<2)

240 +#define NEED_WORK_TREE (1<<3)

241

242 struct cmd_struct {

243 const char *cmd;

@@ -255,8 +256,12 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)

256 if (!help) {

257 if (p->option & RUN_SETUP)

258 prefix = setup_git_directory();

259 + if (p->option & RUN_SETUP_GENTLY) {

260 + int nongit_ok;

261 + prefix = setup_git_directory_gently(&nongit_ok);

262 + }

263

259 - if (use_pager == -1 && p->option & RUN_SETUP)

264 + if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY))

265 use_pager = check_pager_config(p->cmd);

266 if (use_pager == -1 && p->option & USE_PAGER)

267 use_pager = 1;