merge-recursive: don't segfault while handling rename clashes

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index cdb7df5efeec9bbe6ec4ef4ab380403ea662bb12..fdf4ae9ebdba7832a0ac736d56a7b564bba41baa 100644 (file)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -497,6 +497,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
+       if (argc == 1)
+               usage_with_options (fast_export_usage, options);
+
        /* we handle encodings */
        git_config(git_default_config, NULL);