File tree Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Original file line number Diff line number Diff line change @@ -960,12 +960,16 @@ def handle_stderr(proc, iter_checked_out_files):
960960 if not line .startswith ("git checkout-index: " ) and not line .startswith ("git-checkout-index: " ):
961961 is_a_dir = " is a directory"
962962 unlink_issue = "unable to unlink old '"
963+ already_exists_issue = ' already exists, no checkout' # created by entry.c:checkout_entry(...)
963964 if line .endswith (is_a_dir ):
964965 failed_files .append (line [:- len (is_a_dir )])
965966 failed_reasons .append (is_a_dir )
966967 elif line .startswith (unlink_issue ):
967968 failed_files .append (line [len (unlink_issue ):line .rfind ("'" )])
968969 failed_reasons .append (unlink_issue )
970+ elif line .endswith (already_exists_issue ):
971+ failed_files .append (line [:- len (already_exists_issue )])
972+ failed_reasons .append (already_exists_issue )
969973 else :
970974 unknown_lines .append (line )
971975 continue
You can’t perform that action at this time.
0 commit comments