renovate 40.0.0-next.3 → 40.0.0-next.30

package/dist/util/exec/types.d.ts

@@ -1,5 +1,4 @@
 import type { SpawnOptions as ChildProcessSpawnOptions } from 'node:child_process';
-import type { UserEnv } from '../../config/types';
 export interface ToolConstraint {
     toolName: string;
     constraint?: string | null;
@@ -42,7 +41,6 @@ export interface ExecOptions {
     cwd?: string;
     cwdFile?: string;
     env?: Opt<ExtraEnv>;
-    userConfiguredEnv?: UserEnv;
     extraEnv?: Opt<ExtraEnv>;
     docker?: Opt<DockerOptions>;
     toolConstraints?: Opt<ToolConstraint[]>;

package/dist/util/exec/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/util/exec/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { SpawnOptions as ChildProcessSpawnOptions } from 'node:child_process';\nimport type { UserEnv } from '../../config/types';\n\nexport interface ToolConstraint {\n  toolName: string;\n  constraint?: string | null;\n}\n\nexport interface ToolConfig {\n  datasource: string;\n  extractVersion?: string;\n  packageName: string;\n  hash?: boolean;\n  versioning: string;\n}\n\nexport type Opt<T> = T | null | undefined;\n\nexport type VolumesPair = [string, string];\nexport type VolumeOption = Opt<string | VolumesPair>;\n\nexport interface DockerOptions {\n  volumes?: Opt<VolumeOption[]>;\n  envVars?: Opt<Opt<string>[]>;\n  cwd?: Opt<string>;\n}\n\nexport type DataListener = (chunk: any) => void;\nexport interface OutputListeners {\n  stdout?: DataListener[];\n  stderr?: DataListener[];\n}\n\nexport interface RawExecOptions extends ChildProcessSpawnOptions {\n  // TODO: to be removed in #16655\n  /**\n   * @deprecated renovate uses utf8, encoding property is ignored.\n   */\n  encoding: string;\n  maxBuffer?: number | undefined;\n  cwd?: string;\n  outputListeners?: OutputListeners;\n}\n\nexport interface ExecResult {\n  stdout: string;\n  stderr: string;\n}\n\nexport type ExtraEnv<T = unknown> = Record<string, T>;\n\nexport interface ExecOptions {\n  cwd?: string;\n  cwdFile?: string;\n  env?: Opt<ExtraEnv>;\n  userConfiguredEnv?: UserEnv;\n  extraEnv?: Opt<ExtraEnv>;\n  docker?: Opt<DockerOptions>;\n  toolConstraints?: Opt<ToolConstraint[]>;\n  preCommands?: Opt<string[]>;\n  ignoreStdout?: boolean;\n  // Following are pass-through to child process\n  maxBuffer?: number | undefined;\n  timeout?: number | undefined;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/util/exec/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { SpawnOptions as ChildProcessSpawnOptions } from 'node:child_process';\n\nexport interface ToolConstraint {\n  toolName: string;\n  constraint?: string | null;\n}\n\nexport interface ToolConfig {\n  datasource: string;\n  extractVersion?: string;\n  packageName: string;\n  hash?: boolean;\n  versioning: string;\n}\n\nexport type Opt<T> = T | null | undefined;\n\nexport type VolumesPair = [string, string];\nexport type VolumeOption = Opt<string | VolumesPair>;\n\nexport interface DockerOptions {\n  volumes?: Opt<VolumeOption[]>;\n  envVars?: Opt<Opt<string>[]>;\n  cwd?: Opt<string>;\n}\n\nexport type DataListener = (chunk: any) => void;\nexport interface OutputListeners {\n  stdout?: DataListener[];\n  stderr?: DataListener[];\n}\n\nexport interface RawExecOptions extends ChildProcessSpawnOptions {\n  // TODO: to be removed in #16655\n  /**\n   * @deprecated renovate uses utf8, encoding property is ignored.\n   */\n  encoding: string;\n  maxBuffer?: number | undefined;\n  cwd?: string;\n  outputListeners?: OutputListeners;\n}\n\nexport interface ExecResult {\n  stdout: string;\n  stderr: string;\n}\n\nexport type ExtraEnv<T = unknown> = Record<string, T>;\n\nexport interface ExecOptions {\n  cwd?: string;\n  cwdFile?: string;\n  env?: Opt<ExtraEnv>;\n  extraEnv?: Opt<ExtraEnv>;\n  docker?: Opt<DockerOptions>;\n  toolConstraints?: Opt<ToolConstraint[]>;\n  preCommands?: Opt<string[]>;\n  ignoreStdout?: boolean;\n  // Following are pass-through to child process\n  maxBuffer?: number | undefined;\n  timeout?: number | undefined;\n}\n"]}

package/dist/util/exec/utils.d.ts

@@ -1,2 +1,2 @@
 import type { ExecOptions } from './types';
-export declare function getChildEnv({ extraEnv, userConfiguredEnv, env: forcedEnv, }: ExecOptions): Record<string, string>;
+export declare function getChildEnv({ extraEnv, env: forcedEnv, }: ExecOptions): Record<string, string>;

package/dist/util/exec/utils.js

@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChildEnv = getChildEnv;
 const tslib_1 = require("tslib");
 const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
-const global_1 = require("../../config/global");
-const env_1 = require("./env");
-function getChildEnv({ extraEnv, userConfiguredEnv, env: forcedEnv = {}, }) {
-    const globalConfigEnv = global_1.GlobalConfig.get('customEnvVariables');
+const env_1 = require("../env");
+const env_2 = require("./env");
+function getChildEnv({ extraEnv, env: forcedEnv = {}, }) {
+    const globalConfigEnv = (0, env_1.getCustomEnv)();
+    const userConfiguredEnv = (0, env_1.getUserEnv)();
     const inheritedKeys = [];
     for (const [key, val] of Object.entries(extraEnv ?? {})) {
         if (is_1.default.string(val)) {
             inheritedKeys.push(key);
         }
     }
-    const parentEnv = (0, env_1.getChildProcessEnv)(inheritedKeys);
+    const parentEnv = (0, env_2.getChildProcessEnv)(inheritedKeys);
     const combinedEnv = {
         ...extraEnv,
         ...parentEnv,

package/dist/util/exec/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/util/exec/utils.ts"],"names":[],"mappings":";;AAKA,kCA+BC;;AApCD,kEAAkC;AAClC,gDAAmD;AACnD,+BAA2C;AAG3C,SAAgB,WAAW,CAAC,EAC1B,QAAQ,EACR,iBAAiB,EACjB,GAAG,EAAE,SAAS,GAAG,EAAE,GACP;IACZ,MAAM,eAAe,GAAG,qBAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAE/D,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACxD,IAAI,YAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,wBAAkB,EAAC,aAAa,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG;QAClB,GAAG,QAAQ;QACX,GAAG,SAAS;QACZ,GAAG,eAAe;QAClB,GAAG,iBAAiB;QACpB,GAAG,SAAS;KACb,CAAC;IAEF,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACrD,IAAI,YAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { GlobalConfig } from '../../config/global';\nimport { getChildProcessEnv } from './env';\nimport type { ExecOptions } from './types';\n\nexport function getChildEnv({\n  extraEnv,\n  userConfiguredEnv,\n  env: forcedEnv = {},\n}: ExecOptions): Record<string, string> {\n  const globalConfigEnv = GlobalConfig.get('customEnvVariables');\n\n  const inheritedKeys: string[] = [];\n  for (const [key, val] of Object.entries(extraEnv ?? {})) {\n    if (is.string(val)) {\n      inheritedKeys.push(key);\n    }\n  }\n\n  const parentEnv = getChildProcessEnv(inheritedKeys);\n  const combinedEnv = {\n    ...extraEnv,\n    ...parentEnv,\n    ...globalConfigEnv,\n    ...userConfiguredEnv,\n    ...forcedEnv,\n  };\n\n  const result: Record<string, string> = {};\n  for (const [key, val] of Object.entries(combinedEnv)) {\n    if (is.string(val)) {\n      result[key] = `${val}`;\n    }\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/util/exec/utils.ts"],"names":[],"mappings":";;AAKA,kCA+BC;;AApCD,kEAAkC;AAClC,gCAAkD;AAClD,+BAA2C;AAG3C,SAAgB,WAAW,CAAC,EAC1B,QAAQ,EACR,GAAG,EAAE,SAAS,GAAG,EAAE,GACP;IACZ,MAAM,eAAe,GAAG,IAAA,kBAAY,GAAE,CAAC;IACvC,MAAM,iBAAiB,GAAG,IAAA,gBAAU,GAAE,CAAC;IAEvC,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACxD,IAAI,YAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,wBAAkB,EAAC,aAAa,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG;QAClB,GAAG,QAAQ;QACX,GAAG,SAAS;QACZ,GAAG,eAAe;QAClB,GAAG,iBAAiB;QACpB,GAAG,SAAS;KACb,CAAC;IAEF,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACrD,IAAI,YAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { getCustomEnv, getUserEnv } from '../env';\nimport { getChildProcessEnv } from './env';\nimport type { ExecOptions } from './types';\n\nexport function getChildEnv({\n  extraEnv,\n  env: forcedEnv = {},\n}: ExecOptions): Record<string, string> {\n  const globalConfigEnv = getCustomEnv();\n  const userConfiguredEnv = getUserEnv();\n\n  const inheritedKeys: string[] = [];\n  for (const [key, val] of Object.entries(extraEnv ?? {})) {\n    if (is.string(val)) {\n      inheritedKeys.push(key);\n    }\n  }\n\n  const parentEnv = getChildProcessEnv(inheritedKeys);\n  const combinedEnv = {\n    ...extraEnv,\n    ...parentEnv,\n    ...globalConfigEnv,\n    ...userConfiguredEnv,\n    ...forcedEnv,\n  };\n\n  const result: Record<string, string> = {};\n  for (const [key, val] of Object.entries(combinedEnv)) {\n    if (is.string(val)) {\n      result[key] = `${val}`;\n    }\n  }\n\n  return result;\n}\n"]}

package/dist/util/git/author.js

@@ -41,7 +41,7 @@ function parseGitAuthor(input) {
             return result;
         }
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.debug({ err }, 'Unknown error parsing gitAuthor');
     }
     // give up

package/dist/util/git/author.js.map

@@ -1 +1 @@
-{"version":3,"file":"author.js","sourceRoot":"","sources":["../../../lib/util/git/author.ts"],"names":[],"mappings":";;AAKA,wCAwCC;;AA7CD,8EAAoC;AACpC,yCAAsC;AACtC,oCAAiC;AAGjC,SAAgB,cAAc,CAAC,KAAa;IAC1C,IAAI,MAAM,GAAqB,IAAI,CAAC;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,GAAG,yBAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,aAAiC,CAAC;QACtC,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,2CAA2C;YAC3C,aAAa,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,mCAAmC;YACnC,aAAa,GAAG,CAAC,aAAa,IAAI,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAChE,gBAAgB,GAAG,IAAI,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,yBAAK,CAAC,eAAe,CAAC,aAAa,CAAwB,CAAC;QAC3E,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,GAAG;gBACP,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBACpD,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC;YACF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC,CAAC;QACxC,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,iCAAiC,CAAC,CAAC;IAC3D,CAAC;IACD,UAAU;IACV,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import addrs from 'email-addresses';\nimport { logger } from '../../logger';\nimport { regEx } from '../regex';\nimport type { GitAuthor } from './types';\n\nexport function parseGitAuthor(input: string): GitAuthor | null {\n  let result: GitAuthor | null = null;\n  if (!input) {\n    return null;\n  }\n  try {\n    result = addrs.parseOneAddress(input);\n    if (result) {\n      return result;\n    }\n    let massagedInput: string | undefined;\n    let massagedBotEmail = false;\n    if (input.includes('<') && input.includes('>')) {\n      // try wrapping the name part in quotations\n      massagedInput = '\"' + input.replace(regEx(/(\\s?<)/), '\"$1');\n    }\n    if (input.includes('[bot]@')) {\n      // invalid github app/bot addresses\n      massagedInput = (massagedInput ?? input).replace('[bot]@', '@');\n      massagedBotEmail = true;\n    }\n    if (!massagedInput) {\n      return null;\n    }\n    const parsed = addrs.parseOneAddress(massagedInput) as addrs.ParsedMailbox;\n    if (parsed?.address) {\n      result = {\n        name: parsed.name ?? input.replace(regEx(/@.*/), ''),\n        address: parsed.address,\n      };\n      if (massagedBotEmail) {\n        result.address = result.address?.replace('@', '[bot]@');\n      }\n      return result;\n    }\n  } catch (err) /* istanbul ignore next */ {\n    logger.debug({ err }, 'Unknown error parsing gitAuthor');\n  }\n  // give up\n  return null;\n}\n"]}
+{"version":3,"file":"author.js","sourceRoot":"","sources":["../../../lib/util/git/author.ts"],"names":[],"mappings":";;AAKA,wCAwCC;;AA7CD,8EAAoC;AACpC,yCAAsC;AACtC,oCAAiC;AAGjC,SAAgB,cAAc,CAAC,KAAa;IAC1C,IAAI,MAAM,GAAqB,IAAI,CAAC;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,GAAG,yBAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,aAAiC,CAAC;QACtC,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,2CAA2C;YAC3C,aAAa,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,mCAAmC;YACnC,aAAa,GAAG,CAAC,aAAa,IAAI,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAChE,gBAAgB,GAAG,IAAI,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,yBAAK,CAAC,eAAe,CAAC,aAAa,CAAwB,CAAC;QAC3E,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,GAAG;gBACP,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBACpD,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC;YACF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,iCAAiC,CAAC,CAAC;IAC3D,CAAC;IACD,UAAU;IACV,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import addrs from 'email-addresses';\nimport { logger } from '../../logger';\nimport { regEx } from '../regex';\nimport type { GitAuthor } from './types';\n\nexport function parseGitAuthor(input: string): GitAuthor | null {\n  let result: GitAuthor | null = null;\n  if (!input) {\n    return null;\n  }\n  try {\n    result = addrs.parseOneAddress(input);\n    if (result) {\n      return result;\n    }\n    let massagedInput: string | undefined;\n    let massagedBotEmail = false;\n    if (input.includes('<') && input.includes('>')) {\n      // try wrapping the name part in quotations\n      massagedInput = '\"' + input.replace(regEx(/(\\s?<)/), '\"$1');\n    }\n    if (input.includes('[bot]@')) {\n      // invalid github app/bot addresses\n      massagedInput = (massagedInput ?? input).replace('[bot]@', '@');\n      massagedBotEmail = true;\n    }\n    if (!massagedInput) {\n      return null;\n    }\n    const parsed = addrs.parseOneAddress(massagedInput) as addrs.ParsedMailbox;\n    if (parsed?.address) {\n      result = {\n        name: parsed.name ?? input.replace(regEx(/@.*/), ''),\n        address: parsed.address,\n      };\n      if (massagedBotEmail) {\n        result.address = result.address?.replace('@', '[bot]@');\n      }\n      return result;\n    }\n  } catch (err) {\n    logger.debug({ err }, 'Unknown error parsing gitAuthor');\n  }\n  // give up\n  return null;\n}\n"]}

package/dist/util/git/config.js

@@ -8,7 +8,6 @@ const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
 const global_1 = require("../../config/global");
 let noVerify = ['push', 'commit'];
 function setNoVerify(value) {
-    // istanbul ignore if
     if (!is_1.default.array(value, is_1.default.string)) {
         throw new Error('config error: gitNoVerify should be an array of strings');
     }

package/dist/util/git/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/util/git/config.ts"],"names":[],"mappings":";;AAOA,kCAMC;AAED,kCAEC;AAED,0CAcC;;AAjCD,kEAAkC;AAElC,gDAAmD;AAGnD,IAAI,QAAQ,GAAwB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAEvD,SAAgB,WAAW,CAAC,KAA0B;IACpD,qBAAqB;IACrB,IAAI,CAAC,YAAE,CAAC,KAAK,CAAC,KAAK,EAAE,YAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,QAAQ,GAAG,KAAK,CAAC;AACnB,CAAC;AAED,SAAgB,WAAW;IACzB,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAA8B;QACxC,UAAU,EAAE;YACV,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,KAAK;SACd;QACD,MAAM,EAAE,CAAC,sBAAsB,CAAC;KACjC,CAAC;IACF,8CAA8C;IAC9C,MAAM,UAAU,GAAG,qBAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClD,IAAI,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IACzC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport type { SimpleGitOptions } from 'simple-git';\nimport { GlobalConfig } from '../../config/global';\nimport type { GitNoVerifyOption } from './types';\n\nlet noVerify: GitNoVerifyOption[] = ['push', 'commit'];\n\nexport function setNoVerify(value: GitNoVerifyOption[]): void {\n  // istanbul ignore if\n  if (!is.array(value, is.string)) {\n    throw new Error('config error: gitNoVerify should be an array of strings');\n  }\n  noVerify = value;\n}\n\nexport function getNoVerify(): GitNoVerifyOption[] {\n  return noVerify;\n}\n\nexport function simpleGitConfig(): Partial<SimpleGitOptions> {\n  const config: Partial<SimpleGitOptions> = {\n    completion: {\n      onClose: true,\n      onExit: false,\n    },\n    config: ['core.quotePath=false'],\n  };\n  // https://github.com/steveukx/git-js/pull/591\n  const gitTimeout = GlobalConfig.get('gitTimeout');\n  if (is.number(gitTimeout) && gitTimeout > 0) {\n    config.timeout = { block: gitTimeout };\n  }\n  return config;\n}\n"]}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/util/git/config.ts"],"names":[],"mappings":";;AAOA,kCAKC;AAED,kCAEC;AAED,0CAcC;;AAhCD,kEAAkC;AAElC,gDAAmD;AAGnD,IAAI,QAAQ,GAAwB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAEvD,SAAgB,WAAW,CAAC,KAA0B;IACpD,IAAI,CAAC,YAAE,CAAC,KAAK,CAAC,KAAK,EAAE,YAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,QAAQ,GAAG,KAAK,CAAC;AACnB,CAAC;AAED,SAAgB,WAAW;IACzB,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAA8B;QACxC,UAAU,EAAE;YACV,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,KAAK;SACd;QACD,MAAM,EAAE,CAAC,sBAAsB,CAAC;KACjC,CAAC;IACF,8CAA8C;IAC9C,MAAM,UAAU,GAAG,qBAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClD,IAAI,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IACzC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport type { SimpleGitOptions } from 'simple-git';\nimport { GlobalConfig } from '../../config/global';\nimport type { GitNoVerifyOption } from './types';\n\nlet noVerify: GitNoVerifyOption[] = ['push', 'commit'];\n\nexport function setNoVerify(value: GitNoVerifyOption[]): void {\n  if (!is.array(value, is.string)) {\n    throw new Error('config error: gitNoVerify should be an array of strings');\n  }\n  noVerify = value;\n}\n\nexport function getNoVerify(): GitNoVerifyOption[] {\n  return noVerify;\n}\n\nexport function simpleGitConfig(): Partial<SimpleGitOptions> {\n  const config: Partial<SimpleGitOptions> = {\n    completion: {\n      onClose: true,\n      onExit: false,\n    },\n    config: ['core.quotePath=false'],\n  };\n  // https://github.com/steveukx/git-js/pull/591\n  const gitTimeout = GlobalConfig.get('gitTimeout');\n  if (is.number(gitTimeout) && gitTimeout > 0) {\n    config.timeout = { block: gitTimeout };\n  }\n  return config;\n}\n"]}

package/dist/util/git/error.js

@@ -6,7 +6,6 @@ exports.bulkChangesDisallowed = bulkChangesDisallowed;
 const error_messages_1 = require("../../constants/error-messages");
 const logger_1 = require("../../logger");
 const external_host_error_1 = require("../../types/errors/external-host-error");
-// istanbul ignore next
 function checkForPlatformFailure(err) {
     if (process.env.NODE_ENV === 'test') {
         return null;
@@ -32,6 +31,7 @@ function checkForPlatformFailure(err) {
             logger_1.logger.debug({ err }, 'Converting git error to ExternalHostError');
             return new external_host_error_1.ExternalHostError(err, 'git');
         }
+        /* v8 ignore start -- TODO: add test */
     }
     const configErrorStrings = [
         {
@@ -66,7 +66,8 @@ function checkForPlatformFailure(err) {
     }
     return null;
 }
-// istanbul ignore next
+/* v8 ignore stop */
+/* v8 ignore start -- TODO: add tests */
 function handleCommitError(err, branchName, files) {
     checkForPlatformFailure(err);
     if (err.message.includes(`'refs/heads/renovate' exists`)) {
@@ -117,6 +118,7 @@ function handleCommitError(err, branchName, files) {
     // We don't know why this happened, so this will cause bubble up to a branch error
     throw err;
 }
+/* v8 ignore stop */
 function bulkChangesDisallowed(err) {
     return err.message.includes('update more than');
 }

package/dist/util/git/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../lib/util/git/error.ts"],"names":[],"mappings":";;AAMA,0DAiEC;AAGD,8CAkEC;AAED,sDAEC;AAhJD,mEAAmE;AACnE,yCAAsC;AACtC,gFAA2E;AAG3E,uBAAuB;AACvB,SAAgB,uBAAuB,CAAC,GAAU;IAChD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,0BAA0B,GAAG;QACjC,sCAAsC;QACtC,2BAA2B;QAC3B,uCAAuC;QACvC,qCAAqC;QACrC,qCAAqC;QACrC,0CAA0C;QAC1C,gCAAgC;QAChC,sBAAsB;QACtB,sBAAsB;QACtB,uBAAuB;QACvB,wBAAwB;QACxB,WAAW;QACX,mBAAmB,EAAE,sBAAsB;QAC3C,kCAAkC;KACnC,CAAC;IACF,KAAK,MAAM,QAAQ,IAAI,0BAA0B,EAAE,CAAC;QAClD,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,2CAA2C,CAAC,CAAC;YACnE,OAAO,IAAI,uCAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG;QACzB;YACE,KAAK,EAAE,iDAAiD;YACxD,OAAO,EACL,sEAAsE;SACzE;QACD;YACE,KAAK,EAAE,oDAAoD;YAC3D,OAAO,EACL,yEAAyE;SAC5E;QACD;YACE,KAAK,EAAE,0BAA0B;YACjC,OAAO,EACL,wHAAwH;SAC3H;QACD;YACE,KAAK,EAAE,WAAW;YAClB,OAAO,EACL,wEAAwE;SAC3E;QACD;YACE,KAAK,EAAE,uBAAuB;YAC9B,OAAO,EACL,uLAAuL;SAC1L;KACF,CAAC;IACF,KAAK,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,kBAAkB,EAAE,CAAC;QACpD,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,iDAAiD,CAAC,CAAC;YACzE,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,kCAAiB,CAAC,CAAC;YACzC,GAAG,CAAC,eAAe,GAAG,OAAO,CAAC;YAC9B,GAAG,CAAC,iBAAiB,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;YAClE,OAAO,GAAG,CAAC;QACb,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uBAAuB;AACvB,SAAgB,iBAAiB,CAC/B,GAAU,EACV,UAAkB,EAClB,KAAoB;IAEpB,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,CAAC;QACzD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,kCAAiB,CAAC,CAAC;QAC3C,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAChC,KAAK,CAAC,eAAe,GAAG,yCAAyC,CAAC;QAClE,KAAK,CAAC,iBAAiB,GAAG,yCAAyC,UAAU,mIAAmI,CAAC;QACjN,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IACE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAClB,6DAA6D,CAC9D,EACD,CAAC;QACD,eAAM,CAAC,IAAI,CACT,6EAA6E,CAC9E,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IACE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxE,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC,EAClE,CAAC;QACD,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;QAC3C,eAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,kCAAiB,CAAC,CAAC;QAC3C,KAAK,CAAC,gBAAgB,GAAG,UAAU,CAAC;QACpC,KAAK,CAAC,eAAe,GAAG,8BAA8B,CAAC;QACvD,KAAK,CAAC,iBAAiB,GAAG,gFAAgF,CAAC;QAC3G,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,kCAAiB,CAAC,CAAC;QAC3C,KAAK,CAAC,gBAAgB,GAAG,UAAU,CAAC;QACpC,KAAK,CAAC,eAAe,GAAG,2BAA2B,CAAC;QACpD,KAAK,CAAC,iBAAiB,GAAG,oGAAoG,GAAG,CAAC,OAAO,CAAC,UAAU,CAClJ,GAAG,EACH,GAAG,CACJ,IAAI,CAAC;QACN,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;QAC3D,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,yBAAyB,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IACE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC;QAChD,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EACnD,CAAC;QACD,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,oCAAoC,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,kCAAiB,CAAC,CAAC;QAC3C,KAAK,CAAC,gBAAgB,GAAG,UAAU,CAAC;QACpC,KAAK,CAAC,eAAe,GAAG,mBAAmB,CAAC;QAC5C,KAAK,CAAC,iBAAiB,GAAG,+EAA+E,CAAC;QAC1G,MAAM,KAAK,CAAC;IACd,CAAC;IACD,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,gCAAgC,CAAC,CAAC;IACxD,kFAAkF;IAClF,MAAM,GAAG,CAAC;AACZ,CAAC;AAED,SAAgB,qBAAqB,CAAC,GAAU;IAC9C,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;AAClD,CAAC","sourcesContent":["import { CONFIG_VALIDATION } from '../../constants/error-messages';\nimport { logger } from '../../logger';\nimport { ExternalHostError } from '../../types/errors/external-host-error';\nimport type { FileChange } from './types';\n\n// istanbul ignore next\nexport function checkForPlatformFailure(err: Error): Error | null {\n  if (process.env.NODE_ENV === 'test') {\n    return null;\n  }\n  const externalHostFailureStrings = [\n    'remote: Invalid username or password',\n    'gnutls_handshake() failed',\n    'The requested URL returned error: 403',\n    'The requested URL returned error: 5',\n    'The remote end hung up unexpectedly',\n    'access denied or repository not exported',\n    'Could not write new index file',\n    'Failed to connect to',\n    'Connection timed out',\n    'malformed object name',\n    'Could not resolve host',\n    'early EOF',\n    'fatal: bad config', // .gitmodules problem\n    'expected flush after ref listing',\n  ];\n  for (const errorStr of externalHostFailureStrings) {\n    if (err.message.includes(errorStr)) {\n      logger.debug({ err }, 'Converting git error to ExternalHostError');\n      return new ExternalHostError(err, 'git');\n    }\n  }\n\n  const configErrorStrings = [\n    {\n      error: 'GitLab: Branch name does not follow the pattern',\n      message:\n        \"Cannot push because branch name does not follow project's push rules\",\n    },\n    {\n      error: 'GitLab: Commit message does not follow the pattern',\n      message:\n        \"Cannot push because commit message does not follow project's push rules\",\n    },\n    {\n      error: ' is not a member of team',\n      message:\n        'The `Restrict commits to existing GitLab users` rule is blocking Renovate push. Check the Renovate `gitAuthor` setting',\n    },\n    {\n      error: 'TF401027:',\n      message:\n        'You need the Git `GenericContribute` permission to perform this action',\n    },\n    {\n      error: 'matches more than one',\n      message:\n        \"Renovate cannot push branches if there are tags with names the same as Renovate's branches. Please remove conflicting tag names or change Renovate's branchPrefix to avoid conflicts.\",\n    },\n  ];\n  for (const { error, message } of configErrorStrings) {\n    if (err.message.includes(error)) {\n      logger.debug({ err }, 'Converting git error to CONFIG_VALIDATION error');\n      const res = new Error(CONFIG_VALIDATION);\n      res.validationError = message;\n      res.validationMessage = `\\`${err.message.replaceAll('`', \"'\")}\\``;\n      return res;\n    }\n  }\n\n  return null;\n}\n\n// istanbul ignore next\nexport function handleCommitError(\n  err: Error,\n  branchName: string,\n  files?: FileChange[],\n): null {\n  checkForPlatformFailure(err);\n  if (err.message.includes(`'refs/heads/renovate' exists`)) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = 'None';\n    error.validationError = 'An existing branch is blocking Renovate';\n    error.validationMessage = `Renovate needs to create the branch \\`${branchName}\\` but is blocked from doing so because of an existing branch called \\`renovate\\`. Please remove it so that Renovate can proceed.`;\n    throw error;\n  }\n  if (\n    err.message.includes(\n      'refusing to allow a GitHub App to create or update workflow',\n    )\n  ) {\n    logger.warn(\n      'App has not been granted permissions to update Workflows - aborting branch.',\n    );\n    return null;\n  }\n  if (\n    (err.message.includes('remote rejected') || err.message.includes('403')) &&\n    files?.some((file) => file.path?.startsWith('.github/workflows/'))\n  ) {\n    logger.debug({ err }, 'commitFiles error');\n    logger.info('Workflows update rejection - aborting branch.');\n    return null;\n  }\n  if (err.message.includes('protected branch hook declined')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Renovate branch is protected';\n    error.validationMessage = `Renovate cannot push to its branch because branch protection has been enabled.`;\n    throw error;\n  }\n  if (err.message.includes('can only push your own commits')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Bitbucket committer error';\n    error.validationMessage = `Renovate has experienced the following error when attempting to push its branch to the server: \\`${err.message.replaceAll(\n      '`',\n      \"'\",\n    )}\\``;\n    throw error;\n  }\n  if (err.message.includes('remote: error: cannot lock ref')) {\n    logger.error({ err }, 'Error committing files.');\n    return null;\n  }\n  if (\n    err.message.includes('denying non-fast-forward') ||\n    err.message.includes('GH003: Sorry, force-pushing')\n  ) {\n    logger.debug({ err }, 'Permission denied to update branch');\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Force push denied';\n    error.validationMessage = `Renovate is unable to update branch(es) due to force pushes being disallowed.`;\n    throw error;\n  }\n  logger.debug({ err }, 'Unknown error committing files');\n  // We don't know why this happened, so this will cause bubble up to a branch error\n  throw err;\n}\n\nexport function bulkChangesDisallowed(err: Error): boolean {\n  return err.message.includes('update more than');\n}\n"]}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../lib/util/git/error.ts"],"names":[],"mappings":"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","sourcesContent":["import { CONFIG_VALIDATION } from '../../constants/error-messages';\nimport { logger } from '../../logger';\nimport { ExternalHostError } from '../../types/errors/external-host-error';\nimport type { FileChange } from './types';\n\nexport function checkForPlatformFailure(err: Error): Error | null {\n  if (process.env.NODE_ENV === 'test') {\n    return null;\n  }\n  const externalHostFailureStrings = [\n    'remote: Invalid username or password',\n    'gnutls_handshake() failed',\n    'The requested URL returned error: 403',\n    'The requested URL returned error: 5',\n    'The remote end hung up unexpectedly',\n    'access denied or repository not exported',\n    'Could not write new index file',\n    'Failed to connect to',\n    'Connection timed out',\n    'malformed object name',\n    'Could not resolve host',\n    'early EOF',\n    'fatal: bad config', // .gitmodules problem\n    'expected flush after ref listing',\n  ];\n  for (const errorStr of externalHostFailureStrings) {\n    if (err.message.includes(errorStr)) {\n      logger.debug({ err }, 'Converting git error to ExternalHostError');\n      return new ExternalHostError(err, 'git');\n    }\n    /* v8 ignore start -- TODO: add test */\n  }\n\n  const configErrorStrings = [\n    {\n      error: 'GitLab: Branch name does not follow the pattern',\n      message:\n        \"Cannot push because branch name does not follow project's push rules\",\n    },\n    {\n      error: 'GitLab: Commit message does not follow the pattern',\n      message:\n        \"Cannot push because commit message does not follow project's push rules\",\n    },\n    {\n      error: ' is not a member of team',\n      message:\n        'The `Restrict commits to existing GitLab users` rule is blocking Renovate push. Check the Renovate `gitAuthor` setting',\n    },\n    {\n      error: 'TF401027:',\n      message:\n        'You need the Git `GenericContribute` permission to perform this action',\n    },\n    {\n      error: 'matches more than one',\n      message:\n        \"Renovate cannot push branches if there are tags with names the same as Renovate's branches. Please remove conflicting tag names or change Renovate's branchPrefix to avoid conflicts.\",\n    },\n  ];\n  for (const { error, message } of configErrorStrings) {\n    if (err.message.includes(error)) {\n      logger.debug({ err }, 'Converting git error to CONFIG_VALIDATION error');\n      const res = new Error(CONFIG_VALIDATION);\n      res.validationError = message;\n      res.validationMessage = `\\`${err.message.replaceAll('`', \"'\")}\\``;\n      return res;\n    }\n  }\n\n  return null;\n}\n/* v8 ignore stop */\n\n/* v8 ignore start -- TODO: add tests */\nexport function handleCommitError(\n  err: Error,\n  branchName: string,\n  files?: FileChange[],\n): null {\n  checkForPlatformFailure(err);\n  if (err.message.includes(`'refs/heads/renovate' exists`)) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = 'None';\n    error.validationError = 'An existing branch is blocking Renovate';\n    error.validationMessage = `Renovate needs to create the branch \\`${branchName}\\` but is blocked from doing so because of an existing branch called \\`renovate\\`. Please remove it so that Renovate can proceed.`;\n    throw error;\n  }\n  if (\n    err.message.includes(\n      'refusing to allow a GitHub App to create or update workflow',\n    )\n  ) {\n    logger.warn(\n      'App has not been granted permissions to update Workflows - aborting branch.',\n    );\n    return null;\n  }\n  if (\n    (err.message.includes('remote rejected') || err.message.includes('403')) &&\n    files?.some((file) => file.path?.startsWith('.github/workflows/'))\n  ) {\n    logger.debug({ err }, 'commitFiles error');\n    logger.info('Workflows update rejection - aborting branch.');\n    return null;\n  }\n  if (err.message.includes('protected branch hook declined')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Renovate branch is protected';\n    error.validationMessage = `Renovate cannot push to its branch because branch protection has been enabled.`;\n    throw error;\n  }\n  if (err.message.includes('can only push your own commits')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Bitbucket committer error';\n    error.validationMessage = `Renovate has experienced the following error when attempting to push its branch to the server: \\`${err.message.replaceAll(\n      '`',\n      \"'\",\n    )}\\``;\n    throw error;\n  }\n  if (err.message.includes('remote: error: cannot lock ref')) {\n    logger.error({ err }, 'Error committing files.');\n    return null;\n  }\n  if (\n    err.message.includes('denying non-fast-forward') ||\n    err.message.includes('GH003: Sorry, force-pushing')\n  ) {\n    logger.debug({ err }, 'Permission denied to update branch');\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Force push denied';\n    error.validationMessage = `Renovate is unable to update branch(es) due to force pushes being disallowed.`;\n    throw error;\n  }\n  logger.debug({ err }, 'Unknown error committing files');\n  // We don't know why this happened, so this will cause bubble up to a branch error\n  throw err;\n}\n/* v8 ignore stop */\n\nexport function bulkChangesDisallowed(err: Error): boolean {\n  return err.message.includes('update more than');\n}\n"]}

package/dist/util/git/index.js

@@ -119,7 +119,7 @@ async function getDefaultBranch(git) {
     // see https://stackoverflow.com/a/62352647/3005034
     try {
         let res = await git.raw(['rev-parse', '--abbrev-ref', 'origin/HEAD']);
-        // istanbul ignore if
+        /* v8 ignore start -- TODO: add test */
         if (!res) {
             logger_1.logger.debug('Could not determine default branch using git rev-parse');
             const headPrefix = 'HEAD branch: ';
@@ -129,9 +129,11 @@ async function getDefaultBranch(git) {
                 .find((line) => line.startsWith(headPrefix))
                 .replace(headPrefix, '');
         }
+        /* v8 ignore stop */
         return res.replace('origin/', '').trim();
+        /* v8 ignore start -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -139,13 +141,13 @@ async function getDefaultBranch(git) {
         if (err.message.startsWith('fatal: ref refs/remotes/origin/HEAD is not a symbolic ref')) {
             throw new Error(error_messages_1.REPOSITORY_EMPTY);
         }
-        // istanbul ignore if
         if (err.message.includes("fatal: ambiguous argument 'origin/HEAD'")) {
             logger_1.logger.warn({ err }, 'Error getting default branch');
             throw new Error(error_messages_1.TEMPORARY_ERROR);
         }
         throw err;
     }
+    /* v8 ignore stop */
 }
 let config = {};
 // TODO: can be undefined
@@ -159,18 +161,19 @@ async function validateGitVersion() {
     const globalGit = (0, simple_git_1.simpleGit)();
     try {
         const { major, minor, patch, installed } = await globalGit.version();
-        // istanbul ignore if
+        /* v8 ignore next 4 -- TODO: add test */
         if (!installed) {
             logger_1.logger.error('Git not installed');
             return false;
         }
         version = `${major}.${minor}.${patch}`;
+        /* v8 ignore next 4 */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.error({ err }, 'Error fetching git version');
         return false;
     }
-    // istanbul ignore if
+    /* v8 ignore next 7 -- TODO: add test */
     if (!(version && semver_1.default.gte(version, exports.GIT_MINIMUM_VERSION))) {
         logger_1.logger.error({ detectedVersion: version, minimumVersion: exports.GIT_MINIMUM_VERSION }, 'Git version needs upgrading');
         return false;
@@ -198,8 +201,9 @@ async function fetchBranchCommits() {
                 sha;
         });
         logger_1.logger.trace({ branchCommits: config.branchCommits }, 'branch commits');
+        /* v8 ignore next 11 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -235,7 +239,7 @@ async function resetToBranch(branchName) {
     await git.raw(['reset', '--hard', 'origin/' + branchName]);
     await git.raw(['clean', '-fd']);
 }
-// istanbul ignore next
+/* v8 ignore next 4 -- TODO: add test */
 async function resetToCommit(commit) {
     logger_1.logger.debug(`resetToCommit(${commit})`);
     await git.raw(['reset', '--hard', commit]);
@@ -268,7 +272,7 @@ function setGitAuthor(gitAuthor) {
 }
 async function writeGitAuthor() {
     const { gitAuthorName, gitAuthorEmail, writeGitDone } = config;
-    // istanbul ignore if
+    /* v8 ignore next 3 -- TODO: add test */
     if (writeGitDone) {
         return;
     }
@@ -282,8 +286,9 @@ async function writeGitAuthor() {
             logger_1.logger.debug(`Setting git author email: ${gitAuthorEmail}`);
             await git.addConfig('user.email', gitAuthorEmail);
         }
+        /* v8 ignore next 11 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -308,8 +313,9 @@ async function getSubmodules() {
             .trim()
             .split((0, regex_1.regEx)(/[\n\s]/))
             .filter((_e, i) => i % 2);
+        /* v8 ignore next 4 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.warn({ err }, 'Error getting submodules');
         return [];
     }
@@ -340,13 +346,13 @@ function isCloned() {
 }
 async function syncGit() {
     if (gitInitialized) {
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (process.env.RENOVATE_X_CLEAR_HOOKS) {
             await git.raw(['config', 'core.hooksPath', '/dev/null']);
         }
         return;
     }
-    // istanbul ignore if: failsafe
+    /* v8 ignore next 3 -- failsafe TODO: add test */
     if (global_1.GlobalConfig.get('platform') === 'local') {
         throw new Error('Cannot sync git when platform=local');
     }
@@ -370,8 +376,9 @@ async function syncGit() {
             const durationMs = Math.round(Date.now() - fetchStart);
             logger_1.logger.info({ durationMs }, 'git fetch completed');
             clone = false;
+            /* v8 ignore next 6 -- TODO: add test */
         }
-        catch (err) /* istanbul ignore next */ {
+        catch (err) {
             if (err.message === error_messages_1.REPOSITORY_EMPTY) {
                 throw err;
             }
@@ -402,8 +409,9 @@ async function syncGit() {
                 await git.clone(config.url, '.', opts);
             };
             await gitRetry(() => emptyDirAndClone());
+            /* v8 ignore next 10 -- TODO: add test */
         }
-        catch (err) /* istanbul ignore next */ {
+        catch (err) {
             logger_1.logger.debug({ err }, 'git clone error');
             if (err.message?.includes('No space left on device')) {
                 throw new Error(error_messages_1.SYSTEM_INSUFFICIENT_DISK_SPACE);
@@ -418,8 +426,9 @@ async function syncGit() {
     }
     try {
         config.currentBranchSha = (await git.raw(['rev-parse', 'HEAD'])).trim();
+        /* v8 ignore next 6 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message?.includes('fatal: not a git repository')) {
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
         }
@@ -430,8 +439,9 @@ async function syncGit() {
     try {
         const latestCommit = (await git.log({ n: 1 })).latest;
         logger_1.logger.debug({ latestCommit }, 'latest repository commit');
+        /* v8 ignore next 10 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -445,9 +455,9 @@ async function syncGit() {
         config.currentBranch ??
             config.defaultBranch ??
             (await getDefaultBranch(git));
+    /* v8 ignore next -- TODO: add test */
     delete (0, repository_1.getCache)()?.semanticCommits;
 }
-// istanbul ignore next
 async function getRepoStatus(path) {
     if (is_1.default.string(path)) {
         const localDir = global_1.GlobalConfig.get('localDir');
@@ -478,8 +488,9 @@ async function getCommitMessages() {
             format: { message: '%s' },
         });
         return res.all.map((commit) => commit.message);
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch /* istanbul ignore next */ {
+    catch {
         return [];
     }
 }
@@ -498,8 +509,9 @@ async function checkoutBranch(branchName) {
         }
         await git.reset(simple_git_1.ResetMode.HARD);
         return config.currentBranchSha;
+        /* v8 ignore next 11 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -517,15 +529,16 @@ async function getFileList() {
     let files;
     try {
         files = await git.raw(['ls-tree', '-r', branch]);
+        /* v8 ignore next 10 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message?.includes('fatal: Not a valid object name')) {
             logger_1.logger.debug({ err }, 'Branch not found when checking branch list - aborting');
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
         }
         throw err;
     }
-    // istanbul ignore if
+    /* v8 ignore next 3 -- TODO: add test */
     if (!files) {
         return [];
     }
@@ -537,7 +550,7 @@ async function getFileList() {
         .map((line) => line.split((0, regex_1.regEx)(/\t/)).pop());
 }
 function getBranchList() {
-    return Object.keys(config.branchCommits ?? /* istanbul ignore next */ {});
+    return Object.keys(config.branchCommits ?? {});
 }
 async function isBranchBehindBase(branchName, baseBranch) {
     const baseBranchSha = getBranchCommit(baseBranch);
@@ -555,8 +568,9 @@ async function isBranchBehindBase(branchName, baseBranch) {
         logger_1.logger.debug({ baseBranch, branchName }, `branch.isBehindBase(): ${isBehind}`);
         (0, behind_base_branch_cache_1.setCachedBehindBaseResult)(branchName, isBehind);
         return isBehind;
+        /* v8 ignore next 7 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -590,8 +604,9 @@ async function isBranchModified(branchName, baseBranch) {
         for (const commit of commits.all) {
             committedAuthors.add(commit.author_email);
         }
+        /* v8 ignore next 10 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message?.includes('fatal: bad revision')) {
             logger_1.logger.debug({ err }, 'Remote branch not found when checking last commit author - aborting run');
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
@@ -662,7 +677,7 @@ async function isBranchConflicted(baseBranch, branch) {
     }
     catch (err) {
         result = true;
-        // istanbul ignore if: not easily testable
+        /* v8 ignore next 6 -- TODO: add test */
         if (!err?.git?.conflicts?.length) {
             logger_1.logger.debug({ baseBranch, branch, err }, 'isBranchConflicted: unknown error');
         }
@@ -673,8 +688,9 @@ async function isBranchConflicted(baseBranch, branch) {
             if (origBranch !== baseBranch) {
                 await git.checkout(origBranch);
             }
+            /* v8 ignore next 6 -- TODO: add test */
         }
-        catch (err) /* istanbul ignore next */ {
+        catch (err) {
             logger_1.logger.debug({ baseBranch, branch, err }, 'isBranchConflicted: cleanup error');
         }
     }
@@ -692,21 +708,22 @@ async function deleteBranch(branchName) {
         await gitRetry(() => git.raw(deleteCommand));
         logger_1.logger.debug(`Deleted remote branch: ${branchName}`);
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
         logger_1.logger.debug(`No remote branch to delete with name: ${branchName}`);
     }
     try {
+        /* v8 ignore next 2 -- TODO: add test (always throws) */
         await deleteLocalBranch(branchName);
-        // istanbul ignore next
         logger_1.logger.debug(`Deleted local branch: ${branchName}`);
     }
     catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
@@ -777,7 +794,7 @@ async function getBranchLastCommitTime(branchName) {
     }
     catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
@@ -789,8 +806,9 @@ async function getBranchFiles(branchName) {
     try {
         const diff = await gitRetry(() => git.diffSummary([`origin/${branchName}`, `origin/${branchName}^`]));
         return diff.files.map((file) => file.file);
+        /* v8 ignore next 8 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.warn({ err }, 'getBranchFiles error');
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
@@ -809,7 +827,7 @@ async function getFile(filePath, branchName) {
     }
     catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
@@ -871,8 +889,9 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
                 try {
                     await git.rm([fileName]);
                     deletedFiles.push(fileName);
+                    /* v8 ignore next 8 -- TODO: add test */
                 }
-                catch (err) /* istanbul ignore next */ {
+                catch (err) {
                     const errChecked = (0, error_1.checkForPlatformFailure)(err);
                     if (errChecked) {
                         throw errChecked;
@@ -891,9 +910,9 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
                 }
                 else {
                     let contents;
-                    // istanbul ignore else
                     if (typeof file.contents === 'string') {
                         contents = Buffer.from(file.contents);
+                        /* v8 ignore next 3 -- TODO: add test */
                     }
                     else {
                         contents = file.contents;
@@ -910,15 +929,16 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
                     }
                 }
                 try {
-                    // istanbul ignore next
+                    /* v8 ignore next 2 -- TODO: add test */
                     const addParams = fileName === app_strings_1.configFileNames[0] ? ['-f', fileName] : fileName;
                     await git.add(addParams);
                     if (file.isExecutable) {
                         await git.raw(['update-index', '--chmod=+x', fileName]);
                     }
                     addedModifiedFiles.push(fileName);
+                    /* v8 ignore next 11 -- TODO: add test */
                 }
-                catch (err) /* istanbul ignore next */ {
+                catch (err) {
                     if (!err.message.includes('The following paths are ignored by one of your .gitignore files')) {
                         throw err;
                     }
@@ -956,8 +976,9 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
             }),
         };
         return result;
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         return (0, error_1.handleCommitError)(err, branchName, files);
     }
 }
@@ -978,8 +999,9 @@ async function pushCommit({ sourceRef, targetRef, files, }) {
         logger_1.logger.debug({ result: pushRes }, 'git push');
         (0, limits_1.incLimitedValue)('Commits');
         result = true;
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         (0, error_1.handleCommitError)(err, sourceRef, files);
     }
     return result;
@@ -994,8 +1016,9 @@ async function fetchBranch(branchName) {
         config.branchCommits[branchName] = commit;
         config.branchIsModified[branchName] = false;
         return commit;
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         return (0, error_1.handleCommitError)(err, branchName);
     }
 }
@@ -1016,8 +1039,9 @@ async function commitFiles(commitConfig) {
             }
         }
         return null;
+        /* v8 ignore next 6 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message.includes('[rejected] (stale info)')) {
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
         }
@@ -1091,8 +1115,9 @@ async function clearRenovateRefs() {
             .map((line) => line.replace((0, regex_1.regEx)(/[0-9a-f]+\s+/i), '').trim())
             .filter((line) => line.startsWith('refs/renovate/branches/'));
         renovateRefs.push(...refs);
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.warn({ err }, `Renovate refs cleanup error`);
     }
     if (renovateRefs.length) {
@@ -1101,18 +1126,19 @@ async function clearRenovateRefs() {
             await git.push(pushOpts);
         }
         catch (err) {
-            /* istanbul ignore else */
             if ((0, error_1.bulkChangesDisallowed)(err)) {
                 for (const ref of renovateRefs) {
                     try {
                         const pushOpts = ['--delete', 'origin', ref];
                         await git.push(pushOpts);
+                        /* v8 ignore next 4 -- TODO: add test */
                     }
-                    catch (err) /* istanbul ignore next */ {
+                    catch (err) {
                         logger_1.logger.debug({ err }, 'Error deleting "refs/renovate/branches/*"');
                         break;
                     }
                 }
+                /* v8 ignore next 3 -- TODO: add test */
             }
             else {
                 logger_1.logger.warn({ err }, 'Error deleting "refs/renovate/branches/*"');
@@ -1147,8 +1173,9 @@ const treeShaRegex = (0, regex_1.regEx)(/tree\s+(?<treeSha>[0-9a-f]{40})\s*/);
  */
 async function listCommitTree(commitSha) {
     const commitOutput = await git.catFile(['-p', commitSha]);
-    const { treeSha } = treeShaRegex.exec(commitOutput)?.groups ??
-        /* istanbul ignore next: will never happen */ {};
+    const { treeSha } = 
+    /* v8 ignore next -- will never happen ? */
+    treeShaRegex.exec(commitOutput)?.groups ?? {};
     const contents = await git.catFile(['-p', treeSha]);
     const lines = contents.split(regex_1.newlineRegex);
     const result = [];