Commitbfbd5ec

authored and

committed

change decode type and add replace flag

1 parent9541d6b commitbfbd5ecCopy full SHA for bfbd5ec

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ def __init__(self, repo, a_rawpath, b_rawpath, a_blob_id, b_blob_id, a_mode,`
`275`	`275`	`# we need to overwrite "repo" to the corresponding submodule's repo instead`
`276`	`276`	`ifrepoanda_rawpath:`
`277`	`277`	`forsubmoduleinrepo.submodules:`
`278`		`-ifsubmodule.path==a_rawpath.decode("utf-8"):`
	`278`	`+ifsubmodule.path==a_rawpath.decode(defenc,'replace'):`
`279`	`279`	`ifsubmodule.module_exists():`
`280`	`280`	`repo=submodule.module()`
`281`	`281`	`break`

Comments

(0)