Repository navigation
2nd git.commit error: "On branch main nothing to commit, working tree clean" #1530
Description
Description
Commitizen fails if version_provider is set to scm and no files are changed (no changelog, no version number in files) a version bump
Steps to reproduce
- Create en empty repository with
git init testand change into itcd test - Add a configuration
cz.toml
[tool.commitizen]
version_provider = "scm"- Commit it with
git add cz.tomlandcz commit - Run
cz bump
bump: version 0.0.0 → 0.0.1
tag to create: 0.0.1
increment detected: PATCH
[main 16e057b] bump: version 0.0.0 → 0.0.1
1 file changed, 1 insertion(+), 1 deletion(-)
Done!- Add another file / make another changer with
touch foobar,git add foobarandcz commit - Run
cz bump
bump: version 0.0.1 → 0.0.2
tag to create: 0.0.2
increment detected: PATCH
2nd git.commit error: "On branch main
nothing to commit, working tree clean
"If I run cz bump --changelog the second time, there is no error.
Current behavior
cz bump fails if no changes (updated changelog, version number in files) are made during a version bump.
Desired behavior
cz bump should not fail if no changes (updated changelog, version number in files) are made during a version bump.
Screenshots
No response
Environment
Commitizen Version: 4.8.2
Python Version: 3.13.4 (main, Jun 3 2025, 15:34:24) [Clang 17.0.0 (clang-1700.0.13.3)]
Operating System: Darwin
Activity
Lee-W commentedon Jun 10, 2025
With
update_changelog_on_bump = true, it works fine, but this is a valid bug. Thanks for reporting!loelkes commentedon Jun 10, 2025
This came to light while building a workaround for #883
Since I can't use the changelog due to this bug I run
cz bumpwithout--changelog/update_changelog_on_bump = truewoile commentedon Jun 10, 2025
There's a PR open supposed to fix this
#996
Lee-W commentedon Jun 11, 2025
oh.... I'll see whether I can make it merged in the next release
bearomorphism commentedon May 9, 2026
Triage from #1964: Confirmed still valid on master (4.15.1).
commitizen/commands/bump.py(lines 385-394) callsgit commit -aand treats a non-zero return code as fatal. Withversion_provider = "scm"and noversion_files/ changelog updates, there's nothing for the bump commit to include, so git exits with "nothing to commit". Fix should detect this case (e.g., checkis_staging_clean()before commit, or treat the "nothing to commit" return code gracefully) and skip the bump commit, just creating the tag onHEAD.bearomorphism commentedon May 9, 2026
Verification update (re #1964)
Reproduced against current master (4.15.1):
Config:
version_provider = "scm"only, no version_files, no changelog updates.After staging
cz.tomland committingfeat: initial, runningcz bump --yesexits 6 with:No tag is created. Even the first bump fails because there are no files to update.
Verdict: STILL VALID — and slightly worse than the original report, which had the first bump succeed (probably because of
cz.tomlmodifications by older commitizen versions).Suggested fix in
commitizen/commands/bump.py:git.commit(...), check whether anything is staged (git.is_staging_clean()).HEAD.version_provider = "scm"no-op-bump case without requiring users to setupdate_changelog_on_bump.The git tag is the version, and `release patch` is the whole release …