Merge branch 'main' into pipeline-escape-hatch

docs/config-file-options.md

@@ -22,7 +22,7 @@ Example:
 #### `accessToken` **required**
 
 Personal access token.
-Access tokens can be created here: https://github.com/settings/tokens
+Access tokens can be created in the [GitHub Developer Settings, Personal Access Tokens, Tokens (classic)](https://github.com/settings/tokens/new?description=backport%20cli&scopes=repo,workflow)
 
 Please select the necessary access scopes:
 

package.json

@@ -14,7 +14,7 @@
     "branches",
     "branching"
   ],
-  "version": "9.6.0",
+  "version": "9.6.1",
   "main": "./dist/entrypoint.api.js",
   "types": "dist/entrypoint.api.d.ts",
   "bin": {

src/lib/git.test.ts

@@ -364,9 +364,9 @@ describe('deleteRemote', () => {
     repoName: 'kibana',
   } as ValidConfigOptions;
 
-  it('should swallow "no such remote" error', async () => {
+  it('should swallow "no such remote" error on git before 2.30.0', async () => {
     const err = new childProcess.SpawnError({
-      code: 2,
+      code: 128,
       cmdArgs: [],
       stdout: '',
       stderr: "fatal: No such remote: 'my-remote'\n",
@@ -376,11 +376,23 @@ describe('deleteRemote', () => {
     await expect(await deleteRemote(options, remoteName)).toBe(undefined);
   });
 
-  it('should swallow "no such remote" error, even if it is not in English', async () => {
+  it('should swallow "no such remote" error on git 2.30.0 or later', async () => {
     const err = new childProcess.SpawnError({
       code: 2,
       cmdArgs: [],
       stdout: '',
+      stderr: "fatal: No such remote: 'my-remote'\n",
+    });
+
+    jest.spyOn(childProcess, 'spawnPromise').mockRejectedValueOnce(err);
+    await expect(await deleteRemote(options, remoteName)).toBe(undefined);
+  });
+
+  it('should swallow "no such remote" error on git 2.30.0+, even if it is not in English', async () => {
+    const err = new childProcess.SpawnError({
+      code: 2, // returned only by git 2.30.0 or later, earlier versions returned 128
+      cmdArgs: [],
+      stdout: '',
       stderr: "Fehler: Remote-Repository nicht gefunden: 'my-remote'\n",
     });
 

src/lib/git.ts

@@ -191,10 +191,15 @@ export async function deleteRemote(
   } catch (e) {
     const isSpawnError = e instanceof SpawnError;
 
-    // Swallow the "remote does not exist" failure, indicated by a return
-    // code of 2. From `git help remote`: "When subcommands such as add, rename,
-    // and remove can’t find the remote in question, the exit status is 2."
-    if (isSpawnError && e.context.code == 2) {
+    // Swallow the "remote does not exist" failure.
+    // Since git 2.30.0, this failure is indicated by the specific exit code 2.
+    // In earlier versions, the exit code is 128 and only the error message can
+    // tell the problems apart.
+    if (
+      isSpawnError &&
+      (e.context.code == 2 ||
+        (e.context.code == 128 && e.context.stderr.includes('No such remote')))
+    ) {
       return;
     }
 

src/test/e2e/cli/repo-with-programatically-added-commits.mutation.test.ts

@@ -4,7 +4,7 @@ import { getDevAccessToken } from '../../private/getDevAccessToken';
 import { getSandboxPath, resetSandbox } from '../../sandbox';
 import { runBackportViaCli } from './runBackportViaCli';
 
-jest.setTimeout(15_000);
+jest.setTimeout(25_000);
 const accessToken = getDevAccessToken();
 const octokit = new Octokit({ auth: accessToken });
 

src/utils/packageVersion.ts

@@ -1 +1 @@
-export const PACKAGE_VERSION = '9.6.0';
+export const PACKAGE_VERSION = '9.6.1';