Merge pull request #98 from Lee-W/fix-config-name-overwritten-error

woile · web-flow · commit 77ab680d803d · 2019-12-10T10:18:03.000+01:00
Fix config name overwritten error
diff --git a/commitizen/cli.py b/commitizen/cli.py
@@ -155,7 +155,7 @@ def main():
         out.error("Command is required")
         raise SystemExit()
 
-    if args.name:
+    if args.name and not conf["name"]:
         conf.update({"name": args.name})
 
     if args.version:
diff --git a/commitizen/config.py b/commitizen/config.py
@@ -118,7 +118,7 @@ def read_cfg() -> dict:
             conf = read_pyproject_conf(data)
         else:
             warnings.warn(
-                ".cz, setup.cfg, and .cz.cgf will be deprecated "
+                ".cz, setup.cfg, and .cz.cfg will be deprecated "
                 "in next major version. \n"
                 'Please use "pyproject.toml", ".cz.toml" instead'
             )

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ def read_cfg() -> dict:`
`118`	`118`	`conf = read_pyproject_conf(data)`
`119`	`119`	`else:`
`120`	`120`	`warnings.warn(`
`121`		`- ".cz, setup.cfg, and .cz.cgf will be deprecated "`
	`121`	`+ ".cz, setup.cfg, and .cz.cfg will be deprecated "`
`122`	`122`	`"in next major version. \n"`
`123`	`123`	`'Please use "pyproject.toml", ".cz.toml" instead'`
`124`	`124`	`)`