Oct 17, 2023 · Oct 26, 2022 · Nov 26, 2022 · May 14, 2023 · May 14, 2023 · Sep 23, 2023
diff --git a/commitizen/cli.py b/commitizen/cli.py
diff --git a/commitizen/commands/commit.py b/commitizen/commands/commit.py
diff --git a/commitizen/git.py b/commitizen/git.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,7 @@
		CommitizenException,
		ExitCode,
		ExpectedExit,
	InvalidCommandArgumentError,
		NoCommandFoundError,
		)

Expand Down Expand Up		@@ -441,7 +442,7 @@ def main():

		# This is for the command required constraint in 2.0
		try:
	args= parser.parse_args()
	args, unknown_args = parser.parse_known_args()
		except (TypeError, SystemExit) as e:
		# https://github.com/commitizen-tools/commitizen/issues/429
		# argparse raises TypeError when non exist command is provided on Python < 3.9
Expand All		@@ -450,6 +451,24 @@ def main():
		raise NoCommandFoundError()
		raise e

	arguments = vars(args)
	if unknown_args:
	# Raise error for extra-args without -- separation
	if "--" not in unknown_args:
	raise InvalidCommandArgumentError(
	f"Invalid commitizen arguments were found: `{' '.join(unknown_args)}`. "
	"Please use -- separator for extra git args"
	)
	# Raise error for extra-args before --
	elif unknown_args[0] != "--":
	pos = unknown_args.index("--")
	raise InvalidCommandArgumentError(
	f"Invalid commitizen arguments were found before -- separator: `{' '.join(unknown_args[:pos])}`. "
	)
	# TODO: treat case when extra-args and commitizen args are identical
	extra_args = " ".join(unknown_args[1:])
Copy link Member @Lee-W Lee-W Jun 3, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. We might need to handle the case that the user use `--` without actually providing an argument. e.g., `cz commit --` Copy link Contributor Author @SCrocky SCrocky Jun 3, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Sure, how should we deal with it? Warning or error? Copy link Member @Lee-W Lee-W Jun 4, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Warning should be enough in this case 👍 SCrocky reacted with thumbs up emoji
	arguments["extra_cli_args"] = extra_args

		if args.name:
		conf.update({"name": args.name})
		elif not args.name and not conf.path:
Expand All		@@ -465,7 +484,7 @@ def main():
		)
		sys.excepthook = no_raise_debug_excepthook

	args.func(conf, vars(args))()
	args.func(conf, arguments)()


		if __name__ == "__main__":
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,6 +99,9 @@ def __call__(self):

		if signoff:
		c = git.commit(m, "-s")

	if self.arguments.get("extra_cli_args"):
Copy link Member @Lee-W Lee-W Jun 3, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Do we need this if-else block? Could we handle the case in `git.commit()` when `extra_cli_args` is not provided? SCrocky reacted with thumbs up emoji
	c = git.commit(m, extra_args=self.arguments.get("extra_cli_args"))
		else:
		c = git.commit(m)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,13 +98,13 @@ def add(args: str = "") -> cmd.Command:


		def commit(
	message: str, args: str = "", committer_date: str \| None = None
	message: str, args: str = "", extra_args: str = "", committer_date: str \| None = None
		) -> cmd.Command:
		f = NamedTemporaryFile("wb", delete=False)
		f.write(message.encode("utf-8"))
		f.close()

	command = f"git commit {args} -F {f.name}"
	command = cmd.run(f"git commit {args} {extra_args} -F {f.name}")

		if committer_date and os.name == "nt": # pragma: no cover
		# Using `cmd /v /c "{command}"` sets environment variables only for that command
Expand Down