rerere: further clarify do_rerere_one_path()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 6, 2015 at 14:18 UTC
925d73c4217388838e36bfed85553132c458c7d0
1 file changed
+6
-9
rerere.c
+6
-9
@@ -653,16 +653,13 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
653
fprintf(stderr,
654
"Resolved '%s' using previous resolution.\n",
655
path);
656
- goto mark_resolved;
656
+ } else if (!handle_file(path, NULL, NULL)) {
657
+ /* The user has resolved it. */
658
+ copy_file(rerere_path(name, "postimage"), path, 0666);
659
+ fprintf(stderr, "Recorded resolution for '%s'.\n", path);
660
+ } else {
661
+ return;
662
}
658
-
659
- /* Let's see if the user has resolved it. */
660
- if (handle_file(path, NULL, NULL))
661
- return; /* not yet resolved */
662
-
663
- copy_file(rerere_path(name, "postimage"), path, 0666);
664
- fprintf(stderr, "Recorded resolution for '%s'.\n", path);
665
-mark_resolved:
663
free(rr_item->util);
664
rr_item->util = NULL;
665
}