Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
rerere.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/rerere.c b/rerere.c
index 1089a9c..30bdfeb 100644
--- a/rerere.c
+++ b/rerere.c
@@ -644,16 +644,13 @@ static void do_rerere_one_path(struct string_list_item
*rr_item,
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;
}
--
2.5.0-rc2-340-g0cccc16
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
