Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitdfe3ba3

Browse files
committed
Fixed index test which didn't work anymore due to changes in the way the git command communicates
1 parente583a9e commitdfe3ba3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

‎git/index/base.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,12 +959,16 @@ def handle_stderr(proc, iter_checked_out_files):
959959
ifnotline.startswith("git checkout-index: ")andnotline.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
ifline.endswith(is_a_dir):
963964
failed_files.append(line[:-len(is_a_dir)])
964965
failed_reasons.append(is_a_dir)
965966
elifline.startswith(unlink_issue):
966967
failed_files.append(line[len(unlink_issue):line.rfind("'")])
967968
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)
968972
else:
969973
unknown_lines.append(line)
970974
continue

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp