diff --git a/builtin-rerere.c b/builtin-rerere.c
index adfb7b5f48597c19c23235b74cf1a0c779985dc6..2be9ffb77b38ae687537f3599c9d11e3fbc026a9 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
git_config(git_rerere_gc_config, NULL);
dir = opendir(git_path("rr-cache"));
+ if (!dir)
+ die_errno("unable to open rr-cache directory");
while ((e = readdir(dir))) {
if (is_dot_or_dotdot(e->d_name))
continue;
if (argc < 2)
return rerere();
+ if (!strcmp(argv[1], "-h"))
+ usage(git_rerere_usage);
+
fd = setup_rerere(&merge_rr);
if (fd < 0)
return 0;