rerere: further de-dent do_plain_rerere()

It's just easier to follow this way.

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

rerere.c

@@ -682,11 +682,13 @@ static int do_plain_rerere(struct string_list *rr, int fd)
 	 * initial run would catch all and register their preimages.
 	 */
 	for (i = 0; i < conflict.nr; i++) {
-		const char *path = conflict.items[i].string;
-		if (!string_list_has_string(rr, path)) {
 		unsigned char sha1[20];
 		char *hex;
 		int ret;
+		const char *path = conflict.items[i].string;
+
+		if (string_list_has_string(rr, path))
+			continue;
 
 		/*
 		 * Ask handle_file() to scan and assign a
@@ -718,7 +720,6 @@ static int do_plain_rerere(struct string_list *rr, int fd)
 		handle_file(path, NULL, rerere_path(hex, "preimage"));
 		fprintf(stderr, "Recorded preimage for '%s'\n", path);
 	}
-	}
 
 	for (i = 0; i < rr->nr; i++)
 		do_rerere_one_path(&rr->items[i], &update);