We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see ourdocumentation.
There was an error while loading.Please reload this page.
1 parente583a9e commitdfe3ba3Copy full SHA for dfe3ba3
git/index/base.py
@@ -959,12 +959,16 @@ def handle_stderr(proc, iter_checked_out_files):
959
ifnotline.startswith("git checkout-index: ")andnotline.startswith("git-checkout-index: "):
960
is_a_dir=" is a directory"
961
unlink_issue="unable to unlink old '"
962
+already_exists_issue=' already exists, no checkout'# created by entry.c:checkout_entry(...)
963
ifline.endswith(is_a_dir):
964
failed_files.append(line[:-len(is_a_dir)])
965
failed_reasons.append(is_a_dir)
966
elifline.startswith(unlink_issue):
967
failed_files.append(line[len(unlink_issue):line.rfind("'")])
968
failed_reasons.append(unlink_issue)
969
+elifline.endswith(already_exists_issue):
970
+failed_files.append(line[:-len(already_exists_issue)])
971
+failed_reasons.append(already_exists_issue)
972
else:
973
unknown_lines.append(line)
974
continue