fix: simplify release notes staging to avoid git ref conflicts

Author: mahatmamahardhikach

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);
     }
   }
 

test/release-helper.test.js

@@ -105,48 +105,35 @@ test('runRelease infers release type from argv', () => {
   assert.deepStrictEqual(args, ['--release-as', 'minor']);
 });
 
-test('runRelease amends release commit when release notes update succeeds', () => {
+test('runRelease stages release notes when update succeeds', () => {
   const calls = [];
   const spawn = (...args) => {
     calls.push(args);
     return { status: 0 };
   };
 
-  let gitAddArgs;
-  let gitCommitAmendCalled = false;
-  let gitTagArgs;
-
+  let gitAddCalled = false;
   const result = runRelease({
     argv: [...DEFAULT_ARGV, 'patch'],
     env: {},
     spawn,
+    cwd: '/tmp/test',
     dependencies: {
       updateReleaseNotes: () => true,
-      gitAdd: (files) => {
-        gitAddArgs = files;
-        return { status: 0 };
-      },
-      gitCommitAmend: () => {
-        gitCommitAmendCalled = true;
-        return { status: 0 };
-      },
-      loadPackageJson: () => ({ version: '1.2.3' }),
-      buildTagName: (version) => `v${version}`,
-      getCommitMessage: () => ({ status: 0, stdout: 'chore(release): v1.2.3 🚀' }),
-      gitTag: (...args) => {
-        gitTagArgs = args;
-        return { status: 0 };
-      },
       isWorkingTreeClean: () => true
     }
   });
 
   assert.ok(result);
   assert.strictEqual(result.status, 0);
-  assert.deepStrictEqual(gitAddArgs, [path.join('docs', 'release-notes', 'RELEASE_NOTES.md')]);
-  assert.ok(gitCommitAmendCalled);
-  assert.deepStrictEqual(gitTagArgs, ['v1.2.3', 'chore(release): v1.2.3 🚀']);
   assert.strictEqual(calls.length, 2);
+  
+  const [testCommand] = calls[0];
+  assert.strictEqual(testCommand, 'npm');
+  
+  const [execPath, [bin]] = calls[1];
+  assert.strictEqual(execPath, process.execPath);
+  assert.strictEqual(bin, require.resolve('standard-version/bin/cli.js'));
 });
 
 test('runRelease throws if working tree is dirty', () => {