Skip to content

Commit

Permalink
rerere: further clarify do_rerere_one_path()
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Jul 24, 2015
1 parent c7a25d3 commit 925d73c
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions rerere.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 925d73c

Please sign in to comment.