diff --git a/envoy.base.utils/VERSION b/envoy.base.utils/VERSION index 659914ae9..416bfb0a2 100644 --- a/envoy.base.utils/VERSION +++ b/envoy.base.utils/VERSION @@ -1 +1 @@ -0.5.8 +0.5.9 diff --git a/envoy.base.utils/envoy/base/utils/abstract/project/project.py b/envoy.base.utils/envoy/base/utils/abstract/project/project.py index f49bb0f14..62cfc5a0b 100644 --- a/envoy.base.utils/envoy/base/utils/abstract/project/project.py +++ b/envoy.base.utils/envoy/base/utils/abstract/project/project.py @@ -350,11 +350,11 @@ async def _git_commit( else []) await self._exec( " ".join(("git", "add", *changed))) - msg = msg.replace("'", r"\'") + msg = msg.replace("`", r"\`").replace('"', r"\"") await self._exec( " ".join(( "git", "commit", *author_args, *changed, - "-m", f"'{msg}'"))) + "-m", f"\"{msg}\""))) def _patch_versions( self, diff --git a/envoy.base.utils/tests/test_abstract_project.py b/envoy.base.utils/tests/test_abstract_project.py index c9496877e..fec8b3d66 100644 --- a/envoy.base.utils/tests/test_abstract_project.py +++ b/envoy.base.utils/tests/test_abstract_project.py @@ -1073,12 +1073,18 @@ async def test_abstract_project__git_commit(iters, patches): == [[(" ".join(["git", "add", *changed]), ), {}], [(" ".join([ - "git", "commit", *changed, - "-m", f"'{msg.replace.return_value}'"]), ), + "git", + "commit", + *changed, + "-m", + f"\"{msg.replace.return_value.replace.return_value}\""]), ), {}]]) assert ( msg.replace.call_args - == [("'", r"\'"), {}]) + == [("`", r"\`"), {}]) + assert ( + msg.replace.return_value.replace.call_args + == [('"', r"\""), {}]) @pytest.mark.parametrize("returns", [None, 0, 23, "cabbage"])