fix: ap bump leaves CHANGELOG.md ending in one newline and unstages it on rollback

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: softwareentrepreneer

src/afterpython/cli/commands/bump.py

@@ -61,7 +61,8 @@ def _restore(files: list[str], new_files: list[str]):
 
     _git("restore", "--source=HEAD", "--staged", "--worktree", "--", *files)
     for file in new_files:
-        _git("rm", "--cached", "--quiet", "--ignore-unmatch", "--", file)
+        # --force, a hook (e.g. end-of-file-fixer) may have changed the file after it was staged
+        _git("rm", "--cached", "--force", "--quiet", "--ignore-unmatch", "--", file)
         (ap.paths.user_path / file).unlink(missing_ok=True)
     click.echo(f"↩️  Restored {', '.join(files + new_files)}", err=True)
 
@@ -101,6 +102,10 @@ def _write_changelog(tag: str):
     )
     if result.returncode != 0:
         raise click.ClickException(f"git-cliff failed:\n{result.stderr.strip()}")
+    # the blank line after each release also ends up at the end of the file,
+    # end it with a single newline as end-of-file-fixer wants
+    path = ap.paths.user_path / CHANGELOG
+    path.write_text(path.read_text().rstrip("\n") + "\n")
 
 
 def _is_interactive() -> bool:

tests/test_bump_changelog.py

@@ -186,3 +186,30 @@ def test_changelog_has_no_links_without_github_remote(repo, monkeypatch):
     changelog = (repo.user_path / "CHANGELOG.md").read_text()
     assert "## [0.1.2] - " in changelog
     assert "- Fix Y (#7)" in changelog
+
+
+def test_changelog_ends_with_single_newline(repo):
+    _commit(repo, "feat: add X")
+    _run_bump()
+    _commit(repo, "feat: add Y")
+    _run_bump()
+    changelog = (repo.user_path / "CHANGELOG.md").read_text()
+    assert changelog.endswith("\n") and not changelog.endswith("\n\n")
+
+
+def test_rollback_unstages_new_changelog_changed_by_hook(repo):
+    _commit(repo, "feat: add X")
+    # a hook that changes the staged CHANGELOG.md and fails, like end-of-file-fixer
+    hook = repo.user_path / ".git" / "hooks" / "pre-commit"
+    hook.write_text("#!/bin/sh\necho fixed >> CHANGELOG.md\nexit 1\n")
+    hook.chmod(0o755)
+    result = CliRunner().invoke(bump, [])
+    assert result.exit_code != 0
+    status = subprocess.run(
+        ["git", "status", "--porcelain"],
+        cwd=repo.user_path,
+        capture_output=True,
+        text=True,
+        check=True,
+    ).stdout
+    assert status == ""