Do not automatically stage files

package.json

@@ -33,7 +33,7 @@
     "prepublishOnly": "tsc --project ./tsconfig.prod.json",
     "test": "jest",
     "test-private": "jest --config ./jest.config.private.js",
-    "test-all": "yarn test && yarn test-private",
+    "test-all": "yarn lint && yarn test && yarn test-private",
     "start": "ts-node --transpile-only ./src/entrypoint.cli.ts"
   },
   "lint-staged": {
@@ -63,26 +63,28 @@
     "node": ">=10.0.0"
   },
   "dependencies": {
+    "@types/lodash.difference": "^4.5.6",
     "axios": "^0.19.2",
     "dedent": "^0.7.0",
     "del": "^5.1.0",
     "find-up": "^4.1.0",
-    "inquirer": "^7.3.1",
+    "inquirer": "^7.3.3",
+    "lodash.difference": "^4.5.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.isempty": "^4.4.0",
     "lodash.isstring": "^4.0.1",
     "lodash.uniq": "^4.5.0",
     "make-dir": "^3.1.0",
     "ora": "^4.0.4",
     "safe-json-stringify": "^1.2.0",
-    "strip-json-comments": "^3.1.0",
+    "strip-json-comments": "^3.1.1",
     "winston": "^3.3.3",
     "yargs": "^15.4.0"
   },
   "devDependencies": {
     "@types/core-js": "^2.5.2",
     "@types/dedent": "^0.7.0",
-    "@types/inquirer": "^6.5.0",
+    "@types/inquirer": "^7.3.0",
     "@types/jest": "^26.0.4",
     "@types/lodash": "^4.14.157",
     "@types/lodash.flatmap": "^4.5.6",

src/__snapshots__/runWithOptions.test.ts.snap

@@ -57,7 +57,7 @@ Array [
     },
   ],
   Array [
-    "git checkout mySourceBranch && git branch -D backport/6.x/commit-2e63475c",
+    "git reset --hard && git checkout mySourceBranch && git branch -D backport/6.x/commit-2e63475c",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },

src/services/git.test.ts

@@ -2,11 +2,11 @@ import { BackportOptions } from '../options/options';
 import * as childProcess from '../services/child-process-promisified';
 import {
   addRemote,
-  getUnmergedFiles,
+  getUnstagedFiles,
   finalizeCherrypick,
   deleteRemote,
   cherrypick,
-  getFilesWithConflicts,
+  getConflictingFiles,
   createBackportBranch,
 } from '../services/git';
 import { ExecError } from '../test/ExecError';
@@ -15,7 +15,7 @@ beforeEach(() => {
   jest.clearAllMocks();
 });
 
-describe('getUnmergedFiles', () => {
+describe('getUnstagedFiles', () => {
   it('should split lines and remove empty', async () => {
     jest.spyOn(childProcess, 'exec').mockResolvedValueOnce({
       stdout: 'conflicting-file.txt\nconflicting-file2.txt\n',
@@ -27,7 +27,7 @@ describe('getUnmergedFiles', () => {
       repoName: 'kibana',
     } as BackportOptions;
 
-    await expect(await getUnmergedFiles(options)).toEqual([
+    await expect(await getUnstagedFiles(options)).toEqual([
       '/myHomeDir/.backport/repositories/elastic/kibana/conflicting-file.txt',
       '/myHomeDir/.backport/repositories/elastic/kibana/conflicting-file2.txt',
     ]);
@@ -44,11 +44,11 @@ describe('getUnmergedFiles', () => {
       repoName: 'kibana',
     } as BackportOptions;
 
-    await expect(await getUnmergedFiles(options)).toEqual([]);
+    await expect(await getUnstagedFiles(options)).toEqual([]);
   });
 });
 
-describe('getFilesWithConflicts', () => {
+describe('getConflictingFiles', () => {
   it('should split by linebreak and remove empty and duplicate items', async () => {
     const err = {
       killed: false,
@@ -66,7 +66,7 @@ describe('getFilesWithConflicts', () => {
       repoName: 'kibana',
     } as BackportOptions;
 
-    expect(await getFilesWithConflicts(options)).toEqual([
+    expect(await getConflictingFiles(options)).toEqual([
       '/myHomeDir/.backport/repositories/elastic/kibana/conflicting-file.txt',
     ]);
   });
@@ -226,7 +226,7 @@ describe('cherrypick', () => {
         })
       )
 
-      // mock getFilesWithConflicts
+      // mock getConflictingFiles
       .mockRejectedValueOnce(
         new ExecError({
           code: 2,
@@ -237,7 +237,7 @@ describe('cherrypick', () => {
         })
       )
 
-      // mock getUnmergedFiles
+      // mock getUnstagedFiles
       .mockResolvedValueOnce({ stdout: '', stderr: '' });
 
     expect(await cherrypick(options, commit)).toEqual({
@@ -313,10 +313,10 @@ Or refer to the git documentation for more information: https://git-scm.com/docs
       // mock cherry pick command
       .mockRejectedValueOnce(new Error('non-cherrypick error'))
 
-      // getFilesWithConflicts
+      // getConflictingFiles
       .mockResolvedValueOnce({ stdout: '', stderr: '' })
 
-      // getUnmergedFiles
+      // getUnstagedFiles
       .mockResolvedValueOnce({ stdout: '', stderr: '' });
 
     await expect(

src/services/git.ts

@@ -138,10 +138,10 @@ export async function cherrypick(
     }
 
     const isCherryPickError = e.cmd === cmd;
-    const hasConflicts = !isEmpty(await getFilesWithConflicts(options));
-    const hasUnmergedFiles = !isEmpty(await getUnmergedFiles(options));
+    const hasConflicts = !isEmpty(await getConflictingFiles(options));
+    const hasUnstagedFiles = !isEmpty(await getUnstagedFiles(options));
 
-    if (isCherryPickError && (hasConflicts || hasUnmergedFiles)) {
+    if (isCherryPickError && (hasConflicts || hasUnstagedFiles)) {
       return { needsResolving: true };
     }
 
@@ -170,7 +170,7 @@ export async function finalizeCherrypick(options: BackportOptions) {
   }
 }
 
-export async function getFilesWithConflicts(options: BackportOptions) {
+export async function getConflictingFiles(options: BackportOptions) {
   const repoPath = getRepoPath(options);
   try {
     await exec(`git --no-pager diff --check`, { cwd: repoPath });
@@ -200,15 +200,17 @@ export async function getFilesWithConflicts(options: BackportOptions) {
 }
 
 // retrieve the list of files that could not be cleanly merged
-export async function getUnmergedFiles(options: BackportOptions) {
+export async function getUnstagedFiles(options: BackportOptions) {
   const repoPath = getRepoPath(options);
-  const res = await exec(`git --no-pager diff --name-only --diff-filter=U`, {
+  const res = await exec(`git --no-pager diff --name-only`, {
     cwd: repoPath,
   });
-  return res.stdout
+  const files = res.stdout
     .split('\n')
     .filter((file) => !!file)
     .map((file) => pathResolve(repoPath, file));
+
+  return uniq(files);
 }
 
 export async function setCommitAuthor(
@@ -229,10 +231,6 @@ export async function setCommitAuthor(
   }
 }
 
-export async function addUnstagedFiles(options: BackportOptions) {
-  return exec(`git add --update`, { cwd: getRepoPath(options) });
-}
-
 // How the commit flows:
 // ${sourceBranch} -> ${backportBranch} -> ${targetBranch}
 // Example:
@@ -282,7 +280,7 @@ export async function deleteBackportBranch({
   const spinner = ora().start();
 
   await exec(
-    `git checkout ${options.sourceBranch} && git branch -D ${backportBranch}`,
+    `git reset --hard && git checkout ${options.sourceBranch} && git branch -D ${backportBranch}`,
     { cwd: getRepoPath(options) }
   );
 

src/services/prompts.ts

@@ -45,8 +45,6 @@ export async function promptForCommits({
   });
 
   const res = await prompt<CommitChoice[]>({
-    // loop was recently added and not yet part of the types
-    //@ts-expect-error
     loop: false,
     pageSize: 15,
     choices: choices,
@@ -68,8 +66,6 @@ export async function promptForTargetBranches({
   isMultipleChoice: boolean;
 }): Promise<string[]> {
   const res = await prompt<string | string[]>({
-    // loop was recently added and not yet part of the types
-    //@ts-expect-error
     loop: false,
     pageSize: 15,
     choices: targetBranchChoices,

src/test/integration/__snapshots__/integration.test.ts.snap

@@ -549,8 +549,9 @@ fatal: No such remote: 'elastic'
     "",
   ],
   Array [
-    "[VERBOSE] exec success 'git checkout master && git branch -D backport/6.0/pr-85':",
-    "Deleted branch backport/6.0/pr-85 (was <COMMIT HASH>).
+    "[VERBOSE] exec success 'git reset --hard && git checkout master && git branch -D backport/6.0/pr-85':",
+    "HEAD is now at <COMMIT HASH> Add witch (#85)
+Deleted branch backport/6.0/pr-85 (was <COMMIT HASH>).
 ",
   ],
   Array [

src/ui/__snapshots__/cherrypickAndCreatePullRequest.test.ts.snap

@@ -27,7 +27,7 @@ Array [
     },
   ],
   Array [
-    "git --no-pager diff --name-only --diff-filter=U",
+    "git --no-pager diff --name-only",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },
@@ -38,26 +38,44 @@ Array [
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },
   ],
+  Array [
+    "git --no-pager diff --name-only",
+    Object {
+      "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
+    },
+  ],
   Array [
     "git --no-pager diff --check",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },
   ],
+  Array [
+    "git --no-pager diff --name-only",
+    Object {
+      "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
+    },
+  ],
   Array [
     "git --no-pager diff --check",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },
   ],
   Array [
-    "git --no-pager diff --name-only --diff-filter=U",
+    "git --no-pager diff --name-only",
+    Object {
+      "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
+    },
+  ],
+  Array [
+    "git --no-pager diff --check",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },
   ],
   Array [
-    "git add --update",
+    "git --no-pager diff --name-only",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },
@@ -75,7 +93,7 @@ Array [
     },
   ],
   Array [
-    "git checkout myDefaultSourceBranch && git branch -D backport/6.x/commit-mySha",
+    "git reset --hard && git checkout myDefaultSourceBranch && git branch -D backport/6.x/commit-mySha",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },
@@ -122,7 +140,7 @@ Array [
     },
   ],
   Array [
-    "git checkout myDefaultSourceBranch && git branch -D backport/6.x/pr-1000_pr-2000",
+    "git reset --hard && git checkout myDefaultSourceBranch && git branch -D backport/6.x/pr-1000_pr-2000",
     Object {
       "cwd": "/myHomeDir/.backport/repositories/elastic/kibana",
     },