@matheusbsbs / matheus-bagliano / commits / 2321286298

archive: reorder option parsing and config reading

The archive command does three things during its initialization phase: 1. parse command-line options 2. setup the git directory 3. read config During phase (1), if we see any options that do not require a git directory (like "--list"), we handle them immediately and exit, making it safe to abort step (2) if we are not in a git directory. Step (3) must come after step (2), since the git directory may influence configuration. However, this leaves no possibility of configuration from step (3) impacting the command-line options in step (1) (which is useful, for example, for supporting user-configurable output formats). Instead, let's reorder this to: 1. setup the git directory, if it exists 2. read config 3. parse command-line options 4. if we are not in a git repository, die This should have the same external behavior, but puts configuration before command-line parsing. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 15, 2011 at 18:31 UTC 2321286298bf956a3fa8e91dd361b8cf4e81e6a0

1 file changed +14 -4

archive.c

+14 -4

@@ -387,17 +387,27 @@ static int parse_archive_args(int argc, const char **argv,

387 int write_archive(int argc, const char **argv, const char *prefix,

388 int setup_prefix)

389 {

390 + int nongit = 0;

391 const struct archiver *ar = NULL;

392 struct archiver_args args;

393

393 - argc = parse_archive_args(argc, argv, &ar, &args);

394 if (setup_prefix && prefix == NULL)

395 - prefix = setup_git_directory();

395 + prefix = setup_git_directory_gently(&nongit);

396 +

397 + git_config(git_default_config, NULL);

398 +

399 + argc = parse_archive_args(argc, argv, &ar, &args);

400 + if (nongit) {

401 + /*

402 + * We know this will die() with an error, so we could just

403 + * die ourselves; but its error message will be more specific

404 + * than what we could write here.

405 + */

406 + setup_git_directory();

407 + }

408

409 parse_treeish_arg(argv, &args, prefix);

410 parse_pathspec_arg(argv + 1, &args);

411

400 - git_config(git_default_config, NULL);

401 -

412 return ar->write_archive(&args);

413 }