fix(git-node): use stash and detached head for release operations

Author: aduh95

components/git/release.js

@@ -4,7 +4,7 @@ import ReleasePreparation from '../../lib/prepare_release.js';
 import ReleasePromotion from '../../lib/promote_release.js';
 import TeamInfo from '../../lib/team_info.js';
 import Request from '../../lib/request.js';
-import { runPromise } from '../../lib/run.js';
+import { forceRunAsync, runPromise } from '../../lib/run.js';
 
 export const command = 'release [prid..]';
 export const describe = 'Manage an in-progress release or start a new one.';
@@ -114,14 +114,31 @@ function release(state, argv) {
     cli.setAssumeYes();
   }
 
-  return runPromise(main(state, argv, cli, dir)).catch((err) => {
+  return runPromise(wrapStash(() => main(state, argv, cli, dir))).catch((err) => {
     if (cli.spinner.enabled) {
       cli.spinner.fail();
     }
     throw err;
   });
 }
 
+async function wrapStash(fn) {
+  let stashed = false;
+  try {
+    await forceRunAsync('git', ['--no-pager', 'diff', '--exit-code'], { ignoreFailure: false });
+  } catch {
+    await forceRunAsync('git', ['stash', '--include-untracked'], { ignoreFailure: false });
+    stashed = true;
+  }
+  try {
+    await fn();
+  } finally {
+    if (stashed) {
+      await forceRunAsync('git', ['stash', 'pop'], { ignoreFailure: false });
+    }
+  }
+}
+
 async function main(state, argv, cli, dir) {
   if (state === PREPARE) {
     const release = new ReleasePreparation(argv, cli, dir);

lib/promote_release.js

@@ -56,18 +56,12 @@ export default class ReleasePromotion extends Session {
       cli.warn('Current HEAD is not the release commit');
       localCloneIsClean = false;
     }
-    try {
-      await forceRunAsync('git', ['--no-pager', 'diff', '--exit-code'], { ignoreFailure: false });
-    } catch {
-      cli.warn('Some local changes have not been committed');
-      localCloneIsClean = false;
-    }
     if (!localCloneIsClean) {
-      if (await cli.prompt('Should we reset the local HEAD to be the release proposal?')) {
+      if (await cli.prompt('Should we checkout the release proposal?')) {
         cli.startSpinner('Fetching the proposal upstream...');
         await forceRunAsync('git', ['fetch', proposalUpstreamRemote, releaseCommitSha],
           { ignoreFailure: false });
-        await forceRunAsync('git', ['reset', releaseCommitSha, '--hard'], { ignoreFailure: false });
+        await forceRunAsync('git', ['checkout', releaseCommitSha], { ignoreFailure: false });
         cli.stopSpinner('Local HEAD is now in sync with the proposal');
       } else {
         cli.error('Local clone is not ready');