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