path: root/builtin/diff-files.c
diff options
authorJunio C Hamano <>2017-06-01 04:38:16 (GMT)
committerJunio C Hamano <>2017-06-05 02:39:59 (GMT)
commit5a88f97cff0f269f8b2069b17c9da05ee66c98bb (patch)
treec7cb309f1167013a5d292be28c6d5db72b0bbb66 /builtin/diff-files.c
parentf0994fa85dfcbd9854686d7b6de3b05b7952f41c (diff)
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 <>
Diffstat (limited to 'builtin/diff-files.c')
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 15c61fd..6be1df6 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -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);
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */