summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-06 14:18:09 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-24 16:03:56 -0700
commit925d73c4217388838e36bfed85553132c458c7d0 (patch)
tree5f963cb9f1aff01dc241f63468ed03df12ca459b /rerere.c
parentc7a25d3790bdbc486362084238db5a773f728570 (diff)
downloadgit-925d73c4217388838e36bfed85553132c458c7d0.tar.gz
rerere: further clarify do_rerere_one_path()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/rerere.c b/rerere.c
index 7b4028cf11..80be303bd9 100644
--- 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);
- 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;
}