summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-10-22 01:48:14 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-22 11:04:53 -0700
commitcbb3167ef8b73109ed5c5e54aa1915d9c50f83d5 (patch)
tree6e2326d89c92982c0e3bd0ecfb609c5f1c9980e5 /builtin
parentgc -h: show usage even with broken configuration (diff)
downloadtgif-cbb3167ef8b73109ed5c5e54aa1915d9c50f83d5.tar.xz
ls-files -h: show usage even with corrupt index
Part of a campaign to avoid git <command> -h being distracted by access to the repository. A caller hoping to use "git ls-files" with an alternate index as part of a repair operation may well use "git ls-files -h" to show usage while planning it out. [jn: with rewritten log message and tests] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/ls-files.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index bb4f612b3d..87f0b8ac1d 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -530,6 +530,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
OPT_END()
};
+ if (argc == 2 && !strcmp(argv[1], "-h"))
+ usage_with_options(ls_files_usage, builtin_ls_files_options);
+
memset(&dir, 0, sizeof(dir));
prefix = cmd_prefix;
if (prefix)