undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rerere: further clarify do_rerere_one_path()

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-07-06 14:18:09 -07:00
parent c7a25d3790
commit 925d73c421
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rerere.c
View File

@ -653,16 +653,13 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
fprintf(stderr, fprintf(stderr,
"Resolved '%s' using previous resolution.\n", "Resolved '%s' using previous resolution.\n",
path); 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); free(rr_item->util);
rr_item->util = NULL; rr_item->util = NULL;
} }