File tree Expand file tree Collapse file tree 1 file changed +6
-9
lines changed Expand file tree Collapse file tree 1 file changed +6
-9
lines changed Original file line number Diff line number Diff line change @@ -653,16 +653,13 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
653
653
fprintf (stderr ,
654
654
"Resolved '%s' using previous resolution.\n" ,
655
655
path );
656
- goto mark_resolved ;
656
+ } else if (!handle_file (path , NULL , NULL )) {
657
+ /* The user has resolved it. */
658
+ copy_file (rerere_path (name , "postimage" ), path , 0666 );
659
+ fprintf (stderr , "Recorded resolution for '%s'.\n" , path );
660
+ } else {
661
+ return ;
657
662
}
658
-
659
- /* Let's see if the user has resolved it. */
660
- if (handle_file (path , NULL , NULL ))
661
- return ; /* not yet resolved */
662
-
663
- copy_file (rerere_path (name , "postimage" ), path , 0666 );
664
- fprintf (stderr , "Recorded resolution for '%s'.\n" , path );
665
- mark_resolved :
666
663
free (rr_item -> util );
667
664
rr_item -> util = NULL ;
668
665
}
You can’t perform that action at this time.
0 commit comments