rerere: further clarify do_rerere_one_path()

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/rerere.c b/rerere.c
index 7b4028cf11e46b3770f79a41211aed8cdbde983b..80be303bd918698f477af76a54000899ca55e1d3 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -653,16 +653,13 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
                        fprintf(stderr,
                                "Resolved '%s' using previous resolution.\n",
                                path);
                        fprintf(stderr,
                                "Resolved '%s' using previous resolution.\n",
                                path);

-               goto mark_resolved;
+       } else if (!handle_file(path, NULL, NULL)) {
+               /* The user has resolved it. */
+               copy_file(rerere_path(name, "postimage"), path, 0666);
+               fprintf(stderr, "Recorded resolution for '%s'.\n", path);
+       } else {
+               return;

        }
        }

-
-       /* Let's see if the user has resolved it. */
-       if (handle_file(path, NULL, NULL))
-               return; /* not yet resolved */
-
-       copy_file(rerere_path(name, "postimage"), path, 0666);
-       fprintf(stderr, "Recorded resolution for '%s'.\n", path);
-mark_resolved:

        free(rr_item->util);
        rr_item->util = NULL;
 }
        free(rr_item->util);
        rr_item->util = NULL;
 }