Commit 5159a62

author

Scrocky

committed

refactor(git.py): Removed 'extra_args' from git.commit

1 parent 4baecd6 commit 5159a62Copy full SHA for 5159a62

File tree

3 files changed

-7

lines changed

commitizen
- commands
  - commit.py
- git.py
tests/commands
- test_commit_command.py

3 files changed

-7

lines changed

`‎commitizen/commands/commit.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ def __call__(self):`
`105`	`105`	`else:`
`106`	`106`	`extra_args = self.arguments.get("extra_cli_args", "")`
`107`	`107`
`108`		`- c = git.commit(m, extra_args=extra_args)`
	`108`	`+ c = git.commit(m, args=extra_args)`
`109`	`109`
`110`	`110`	`if c.return_code != 0:`
`111`	`111`	`out.error(c.err)`

`‎commitizen/git.py‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,13 @@ def add(args: str = "") -> cmd.Command:`
`100`	`100`	`def commit(`
`101`	`101`	`message: str,`
`102`	`102`	`args: str = "",`
`103`		`- extra_args: str = "",`
`104`	`103`	`committer_date: str \| None = None,`
`105`	`104`	`) -> cmd.Command:`
`106`	`105`	`f = NamedTemporaryFile("wb", delete=False)`
`107`	`106`	`f.write(message.encode("utf-8"))`
`108`	`107`	`f.close()`
`109`	`108`
`110`		`- command = f"git commit {args} {extra_args}-F {f.name}"`
	`109`	`+ command = f"git commit {args} -F {f.name}"`
`111`	`110`
`112`	`111`	`if committer_date and os.name == "nt": # pragma: no cover`
`113`	`112`	# Using `cmd /v /c "{command}"` sets environment variables only for that command

`‎tests/commands/test_commit_command.py‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ def test_commit_retry_works(config, mocker: MockFixture):`
`88`	`88`
`89`	`89`	`commands.Commit(config, {"retry": True})()`
`90`	`90`
`91`		`- commit_mock.assert_called_with("feat: user created\n\ncloses #21", extra_args="")`
	`91`	`+ commit_mock.assert_called_with("feat: user created\n\ncloses #21", args="")`
`92`	`92`	`prompt_mock.assert_called_once()`
`93`	`93`	`success_mock.assert_called_once()`
`94`	`94`	`assert not os.path.isfile(temp_file)`
`@@ -174,7 +174,7 @@ def test_commit_command_with_signoff_option(config, mocker: MockFixture):`
`174`	`174`
`175`	`175`	`commands.Commit(config, {"signoff": True})()`
`176`	`176`
`177`		`- commit_mock.assert_called_once_with(ANY, extra_args="-- -s")`
	`177`	`+ commit_mock.assert_called_once_with(ANY, args="-- -s")`
`178`	`178`	`success_mock.assert_called_once()`
`179`	`179`
`180`	`180`
`@@ -197,7 +197,7 @@ def test_commit_command_with_always_signoff_enabled(config, mocker: MockFixture)`
`197`	`197`	`config.settings["always_signoff"] = True`
`198`	`198`	`commands.Commit(config, {})()`
`199`	`199`
`200`		`- commit_mock.assert_called_once_with(ANY, extra_args="-- -s")`
	`200`	`+ commit_mock.assert_called_once_with(ANY, args="-- -s")`
`201`	`201`	`success_mock.assert_called_once()`
`202`	`202`
`203`	`203`
`@@ -294,5 +294,5 @@ def test_commit_command_with_extra_args(config, mocker: MockFixture):`
`294`	`294`	`commit_mock.return_value = cmd.Command("success", "", b"", b"", 0)`
`295`	`295`	`success_mock = mocker.patch("commitizen.out.success")`
`296`	`296`	`commands.Commit(config, {"extra_cli_args": "-- -extra-args1 -extra-arg2"})()`
`297`		`- commit_mock.assert_called_once_with(ANY, extra_args="-- -extra-args1 -extra-arg2")`
	`297`	`+ commit_mock.assert_called_once_with(ANY, args="-- -extra-args1 -extra-arg2")`
`298`	`298`	`success_mock.assert_called_once()`

0 commit comments

Comments

(0)

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!

Commit 5159a62

File tree

3 files changed

3 files changed

`‎commitizen/commands/commit.py‎`

`‎commitizen/git.py‎`

`‎tests/commands/test_commit_command.py‎`

0 commit comments