Merge branch 'jc/maint-svn-info-test-fix'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 6a307ab784a25c9f8d201392f79c7146a4a8eece..fb2d5f4b1fb0ce9ef2fb0c4099b5fea6d07b6838 100644 (file)
--- 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)