@programinglive/commiter 1.1.5 → 1.1.6

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.1.6](https://github.com/programinglive/commiter/compare/v1.1.5...v1.1.6) (2025-11-05)
+
+
+### 🐛 Bug Fixes
+
+* revert to simple release notes staging to avoid git ref conflicts ([2f6a40e](https://github.com/programinglive/commiter/commit/2f6a40ed7259cffdb0b1de1633af3e43df475044))
+
 ### [1.1.5](https://github.com/programinglive/commiter/compare/v1.1.4...v1.1.5) (2025-11-05)
 
 

package/docs/release-notes/RELEASE_NOTES.md

@@ -4,6 +4,7 @@ This document summarizes every published version of `@programinglive/commiter`.
 
 | Version | Date | Highlights |
 |---------|------|------------|
+| 1.1.6 | 2025-11-05 | revert to simple release notes staging to avoid git ref conflicts (2f6a40e) |
 | 1.1.5 | 2025-11-05 | include release notes in release commit via amendment (3f2afa8) |
 | 1.1.4 | 2025-11-05 | simplify release notes staging to avoid git ref conflicts (d4077aa) |
 | 1.1.3 | 2025-11-05 | See CHANGELOG for details. |
@@ -28,6 +29,13 @@ This document summarizes every published version of `@programinglive/commiter`.
 
 
 
+
+## 1.1.6 – 🐛 Bug Fixes
+
+Released on **2025-11-05**.
+
+- revert to simple release notes staging to avoid git ref conflicts (2f6a40e)
+
 ## 1.1.5 – ✨ Features
 
 Released on **2025-11-05**.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@programinglive/commiter",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Commiter keeps repositories release-ready by enforcing conventional commits, generating icon-rich changelog entries, and orchestrating semantic version bumps without manual toil. It bootstraps Husky hooks, commitlint rules, and release scripts that inspect history, detect framework-specific test commands, run them automatically, tag git releases, coordinate npm publishing, surface release metrics, enforce project-specific checks, and give maintainers observability across distributed teams. Plus!",
   "main": "index.js",
   "bin": {

package/scripts/release.js

@@ -173,17 +173,6 @@ function runRelease({
 
   const releaseNotesPath = dependencies.releaseNotesPath || path.join('docs', 'release-notes', 'RELEASE_NOTES.md');
   const updateNotes = dependencies.updateReleaseNotes || ((options = {}) => updateReleaseNotes({ rootDir: cwd, ...options }));
-  const gitAdd = dependencies.gitAdd || ((files) => spawnSync('git', ['add', ...files], { stdio: 'inherit', cwd }));
-  const gitCommitAmend = dependencies.gitCommitAmend || (() => spawnSync('git', ['commit', '--amend', '--no-edit'], { stdio: 'inherit', cwd }));
-  const gitTag = dependencies.gitTag || ((tagName, tagMessage) => {
-    const args = tagMessage
-      ? ['tag', '-f', '-a', tagName, '-m', tagMessage]
-      : ['tag', '-f', tagName];
-    return spawnSync('git', args, { stdio: 'inherit', cwd });
-  });
-  const getCommitMessage = dependencies.getCommitMessage || (() => spawnSync('git', ['log', '-1', '--pretty=%s'], { cwd, encoding: 'utf8' }));
-  const buildTagName = dependencies.buildTagName || ((version) => `v${version}`);
-  const loadPackage = dependencies.loadPackageJson || ((dir) => loadPackageJson(dir));
 
   let notesUpdated = false;
   try {
@@ -193,40 +182,9 @@ function runRelease({
   }
 
   if (notesUpdated) {
-    const gitAddResult = gitAdd([releaseNotesPath]);
+    const gitAddResult = spawnSync('git', ['add', releaseNotesPath], { stdio: 'inherit', cwd });
     if (!gitAddResult || typeof gitAddResult.status !== 'number' || gitAddResult.status !== 0) {
-      console.warn('⚠️  Release notes updated but failed to stage changes. Please add them manually.');
-      return releaseResult;
-    }
-
-    const gitCommitResult = gitCommitAmend();
-    if (!gitCommitResult || typeof gitCommitResult.status !== 'number' || gitCommitResult.status !== 0) {
-      console.warn('⚠️  Release notes updated but failed to amend release commit. Please amend manually.');
-      return releaseResult;
-    }
-
-    const packageJson = loadPackage(cwd);
-    const version = packageJson && packageJson.version;
-    if (!version) {
-      console.warn('⚠️  Cannot retag release: package.json version missing. Please update tag manually.');
-      return releaseResult;
-    }
-
-    const tagName = buildTagName(version);
-    let tagMessage;
-    try {
-      const commitMessageResult = getCommitMessage();
-      if (commitMessageResult && typeof commitMessageResult.status === 'number' && commitMessageResult.status === 0) {
-        const output = typeof commitMessageResult.stdout === 'string' ? commitMessageResult.stdout : '';
-        tagMessage = output.trim();
-      }
-    } catch (error) {
-      console.warn(`⚠️  Unable to read release commit message: ${error.message}`);
-    }
-
-    const gitTagResult = gitTag(tagName, tagMessage);
-    if (!gitTagResult || typeof gitTagResult.status === 'number' && gitTagResult.status !== 0) {
-      console.warn(`⚠️  Failed to retag ${tagName}. Please update the tag manually before pushing.`);
+      console.warn('⚠️  Release notes updated but failed to stage. Please add manually: git add ' + releaseNotesPath);
     }
   }