diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-19 12:38:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-19 12:38:45 -0700 |
| commit | 50ad8561dee9d479e41586689486cbbb4a742f7b (patch) | |
| tree | 41687648bc7b1674a109fdeb490b9b749f458fde /builtin/diff-files.c | |
| parent | 06959fe0e1f50608ff872be386a7c53d97f885f4 (diff) | |
| parent | d691551192ac845747694258ccae9ffeeb6bdd58 (diff) | |
| download | git-50ad8561dee9d479e41586689486cbbb4a742f7b.tar.gz | |
Merge branch 'jk/consistent-h'
"git $cmd -h" for builtin commands calls the implementation of the
command (i.e. cmd_$cmd() function) without doing any repository
set-up, and the commands that expect RUN_SETUP is done by the Git
potty needs to be prepared to show the help text without barfing.
* jk/consistent-h:
t0012: test "-h" with builtins
git: add hidden --list-builtins option
version: convert to parse-options
diff- and log- family: handle "git cmd -h" early
submodule--helper: show usage for "-h"
remote-{ext,fd}: print usage message on invalid arguments
upload-archive: handle "-h" option early
credential: handle invalid arguments earlier
Diffstat (limited to 'builtin/diff-files.c')
| -rw-r--r-- | builtin/diff-files.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c index a572da9d51..c97069a714 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); + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ init_revisions(&rev, prefix); gitmodules_config(); |