rerere forget path: forget recorded resolution

[git.git] / builtin-rerere.c

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 343d6cde48266d63c0aa6826b973e55b48820745..0253abf9b698ed10a8df5c21ef07c93b8e6460dc 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -48,6 +48,8 @@ static void garbage_collect(struct string_list *rr)
 
        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;
@@ -108,6 +110,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 
        if (!strcmp(argv[1], "-h"))
                usage(git_rerere_usage);
+       else if (!strcmp(argv[1], "forget"))
+               return rerere_forget(argv + 2);
 
        fd = setup_rerere(&merge_rr);
        if (fd < 0)