Commit21e21d0

committed

First attempt to fix failing test of#1103

However, the test asserts on the provided context to be correct,which is hard to do in this branch while it's easy to doubt the valueof this.Lastly, there seems to be no way to ignore errors in `git` withoutmuting all output, which is in fact parsed.Maybe it's possible to ignore errors while parsing the new kind oferror message.

1 parent3dd71d3 commit21e21d0Copy full SHA for 21e21d0

File tree

1 file changed

+10

-4

lines changed

git/index
- base.py

1 file changed

+10

-4

lines changed

`‎git/index/base.py`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1028,16 +1028,16 @@ def checkout(self, paths=None, force=False, fprogress=lambda args: None, *kwar`
`1028`	`1028`	`ifforce:`
`1029`	`1029`	`args.append("--force")`
`1030`	`1030`
	`1031`	`+failed_files= []`
	`1032`	`+failed_reasons= []`
	`1033`	`+unknown_lines= []`
`1031`	`1034`	`defhandle_stderr(proc,iter_checked_out_files):`
`1032`	`1035`	`stderr=proc.stderr.read()`
`1033`	`1036`	`ifnotstderr:`
`1034`	`1037`	`return`
`1035`	`1038`	`# line contents:`
`1036`	`1039`	`stderr=stderr.decode(defenc)`
`1037`	`1040`	`# git-checkout-index: this already exists`
`1038`		`-failed_files= []`
`1039`		`-failed_reasons= []`
`1040`		`-unknown_lines= []`
`1041`	`1041`	`endings= (' already exists',' is not in the cache',' does not exist at stage',' is unmerged')`
`1042`	`1042`	`forlineinstderr.splitlines():`
`1043`	`1043`	`ifnotline.startswith("git checkout-index: ")andnotline.startswith("git-checkout-index: "):`
`@@ -1130,7 +1130,13 @@ def handle_stderr(proc, iter_checked_out_files):`
`1130`	`1130`	`checked_out_files.append(co_path)`
`1131`	`1131`	`# END path is a file`
`1132`	`1132`	`# END for each path`
`1133`		`-self._flush_stdin_and_wait(proc,ignore_stdout=True)`
	`1133`	`+try:`
	`1134`	`+self._flush_stdin_and_wait(proc,ignore_stdout=True)`
	`1135`	`+exceptGitCommandError:`
	`1136`	`+# Without parsing stdout we don't know what failed.`
	`1137`	`+raiseCheckoutError(`
	`1138`	`+"Some files could not be checked out from the index, probably because they didn't exist.",`
	`1139`	`+failed_files, [],failed_reasons)`
`1134`	`1140`
`1135`	`1141`	`handle_stderr(proc,checked_out_files)`
`1136`	`1142`	`returnchecked_out_files`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit21e21d0

File tree

1 file changed

1 file changed

`‎git/index/base.py`

0 commit comments