Browse Source

diff- and log- family: handle "git cmd -h" early

"git $builtin -h" bypasses the usual repository setup and calls the
cmd_$builtin() function, expecting it to show the help text.

Unfortunately the commands in the log- and the diff- family want to
call into the revisions machinery, which by definition needs to have
a repository already discovered.  Strictly speaking, they may not
need a repository only for parsing "-h", but it is a good discipline
to future-proof codepath to ensure that setup_revisions() is called
after we know that a repository is there.

Handle the "git $builtin -h" special case very early in these
commands to work around potential issues.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 8 years ago
parent
commit
5a88f97cff
  1. 3
      builtin/diff-files.c
  2. 3
      builtin/diff-index.c
  3. 3
      builtin/diff-tree.c
  4. 3
      builtin/rev-list.c

3
builtin/diff-files.c

@ -20,6 +20,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) @@ -20,6 +20,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
int result;
unsigned options = 0;

if (argc == 2 && !strcmp(argv[1], "-h"))
usage(diff_files_usage);

init_revisions(&rev, prefix);
gitmodules_config();
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */

3
builtin/diff-index.c

@ -17,6 +17,9 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) @@ -17,6 +17,9 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
int i;
int result;

if (argc == 2 && !strcmp(argv[1], "-h"))
usage(diff_cache_usage);

init_revisions(&rev, prefix);
gitmodules_config();
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */

3
builtin/diff-tree.c

@ -105,6 +105,9 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) @@ -105,6 +105,9 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
struct setup_revision_opt s_r_opt;
int read_stdin = 0;

if (argc == 2 && !strcmp(argv[1], "-h"))
usage(diff_tree_usage);

init_revisions(opt, prefix);
gitmodules_config();
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */

3
builtin/rev-list.c

@ -277,6 +277,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) @@ -277,6 +277,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
int use_bitmap_index = 0;
const char *show_progress = NULL;

if (argc == 2 && !strcmp(argv[1], "-h"))
usage(rev_list_usage);

git_config(git_default_config, NULL);
init_revisions(&revs, prefix);
revs.abbrev = DEFAULT_ABBREV;

Loading…
Cancel
Save