rebase, lint & code fixes

Author: sergiolms

package.json

@@ -17905,35 +17905,35 @@
 		"build:extension": "webpack --mode development --config-name extension:node",
 		"build:extension:browser": "webpack --mode development --config-name extension:webworker",
 		"build:webviews": "webpack --mode development --config-name webviews",
-		"build:icons": "pnpm run icons:svgo && pnpm run fantasticon && pnpm run icons:apply",
+		"build:icons": "npm run icons:svgo && npm run fantasticon && npm run icons:apply",
 		"build:tests": "node ./scripts/esbuild.tests.mjs --mode development",
 		"generate:docs:telemetry": "node ./scripts/generate-telemetry-docs.mjs",
 		"bundle": "webpack --mode production",
 		"bundle:extension": "webpack --mode production --config-name extension:node",
 		"clean": "pnpx rimraf --glob dist out .vscode-test .vscode-test-web .eslintcache* tsconfig*.tsbuildinfo",
-		"clean:all": "pnpm run clean && pnpm run clean:deps",
+		"clean:all": "npm run clean && npm run clean:deps",
 		"clean:lint": "pnpx rimraf .eslintcache",
 		"clean:deps": "pnpx rimraf node_modules",
 		"copy:images": "webpack --config webpack.config.images.mjs",
-		"graph:link": "pnpm link @gitkraken/gitkraken-components",
-		"graph:link:main": "pushd \"../GitKrakenComponents\" && pnpm link && popd && pnpm graph:link",
-		"graph:unlink": "pnpm unlink @gitkraken/gitkraken-components && pnpm install --force",
-		"graph:unlink:main": "pnpm graph:unlink && pushd \"../GitKrakenComponents\" && pnpm unlink && popd",
+		"graph:link": "npm link @gitkraken/gitkraken-components",
+		"graph:link:main": "pushd \"../GitKrakenComponents\" && npm link && popd && npm graph:link",
+		"graph:unlink": "npm unlink @gitkraken/gitkraken-components && npm install --force",
+		"graph:unlink:main": "npm graph:unlink && pushd \"../GitKrakenComponents\" && npm unlink && popd",
 		"icons:apply": "node ./scripts/applyIconsContribution.mjs",
 		"icons:svgo": "svgo -q -f ./images/icons/ --config svgo.config.js",
-		"lint": "pnpm run clean:lint && eslint .",
-		"lint:fix": "pnpm run clean:lint && eslint . --fix",
-		"lint:webviews": "pnpm run clean:lint && eslint \"src/webviews/apps/**/*.ts?(x)\"",
+		"lint": "npm run clean:lint && eslint .",
+		"lint:fix": "npm run clean:lint && eslint . --fix",
+		"lint:webviews": "npm run clean:lint && eslint \"src/webviews/apps/**/*.ts?(x)\"",
 		"package": "vsce package --no-dependencies",
-		"package-pre": "pnpm run patch-pre && pnpm run package --pre-release",
+		"package-pre": "npm run patch-pre && npm run package --pre-release",
 		"patch-pre": "node ./scripts/applyPreReleasePatch.mjs",
 		"prep-release": "node ./scripts/prep-release.mjs",
 		"pretty": "prettier --config .prettierrc --write .",
 		"pretty:check": "prettier --config .prettierrc --check .",
 		"pub": "vsce publish --no-dependencies",
 		"pub-pre": "vsce publish --no-dependencies --pre-release",
-		"rebuild": "pnpm run reset && pnpm run build",
-		"reset": "pnpm run clean && pnpm install --force",
+		"rebuild": "npm run reset && npm run build",
+		"reset": "npm run clean && npm install --force",
 		"test": "vscode-test",
 		"test:e2e": "playwright test -c tests/e2e/playwright.config.ts",
 		"watch": "webpack --watch --mode development",
@@ -17946,8 +17946,8 @@
 		"update-dts:main": "pushd \"src/@types\" && pnpx  @vscode/dts main && popd",
 		"update-emoji": "node ./scripts/generateEmojiShortcodeMap.mjs",
 		"update-licenses": "node ./scripts/generateLicenses.mjs",
-		"pretest": "pnpm run build:tests",
-		"vscode:prepublish": "pnpm run bundle"
+		"pretest": "npm run build:tests",
+		"vscode:prepublish": "npm run bundle"
 	},
 	"dependencies": {
 		"@gitkraken/gitkraken-components": "10.7.0",

src/env/node/git/git.ts

@@ -166,13 +166,11 @@ function getStdinUniqueKey(): number {
 type ExitCodeOnlyGitCommandOptions = GitCommandOptions & { exitCodeOnly: true };
 export type PushForceOptions = { withLease: true; ifIncludes?: boolean } | { withLease: false; ifIncludes?: never };
 
-const branchErrorAndReason = [
+const branchErrorAndReason: [RegExp, BranchErrorReason][] = [
 	[GitErrors.noRemoteReference, BranchErrorReason.NoRemoteReference],
 	[GitErrors.invalidBranchName, BranchErrorReason.InvalidBranchName],
 	[GitErrors.branchAlreadyExists, BranchErrorReason.BranchAlreadyExists],
 	[GitErrors.branchNotFullyMerged, BranchErrorReason.BranchNotFullyMerged],
-	[GitErrors.branchNotYetBorn, BranchErrorReason.BranchNotYetBorn],
-	[GitErrors.branchFastForwardRejected, BranchErrorReason.BranchFastForwardRejected],
 ];
 
 export class Git {

src/env/node/git/localGitProvider.ts

@@ -1253,25 +1253,25 @@ export class LocalGitProvider implements GitProvider, Disposable {
 	}
 
 	@log()
-	createBranch(repoPath: string, name: string, ref: string): Promise<void> {
+	async createBranch(repoPath: string, name: string, ref: string): Promise<void> {
 		try {
-			return void this.git.branch(repoPath, name, ref);
+			await this.git.branch(repoPath, name, ref);
 		} catch (ex) {
 			if (ex instanceof BranchError) {
-				throw ex.WithBranch(branch.name);
+				throw ex.WithBranch(name);
 			}
 
 			throw ex;
 		}
 	}
 
 	@log()
-	renameBranch(repoPath: string, oldName: string, newName: string): Promise<void> {
+	async renameBranch(repoPath: string, oldName: string, newName: string): Promise<void> {
 		try {
-			return void this.git.branch(repoPath, '-m', oldName, newName);
+			await this.git.branch(repoPath, '-m', oldName, newName);
 		} catch (ex) {
 			if (ex instanceof BranchError) {
-				throw ex.WithBranch(branch.name);
+				throw ex.WithBranch(oldName);
 			}
 
 			throw ex;
@@ -1306,7 +1306,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 			}
 
 			const remote = getRemoteNameFromBranchName(branch.upstream.name);
-			remoteCommit = await this.git.rev_list(repoPath, `refs/remotes/${remote}/${branch.ref}`, {
+			const remoteCommit = await this.git.rev_list(repoPath, `refs/remotes/${remote}/${branch.ref}`, {
 				maxResults: 1,
 			});
 
@@ -1316,8 +1316,8 @@ export class LocalGitProvider implements GitProvider, Disposable {
 				await this.git.branch(repoPath, ...args, branch.ref);
 			} catch (ex) {
 				// If it fails, restore the remote branch
-				await this.git.update_ref(repoPath, `refs/remotes/${remote}/${branch.ref}`, commit);
-				await this.git.branch__set_upstream(repoPath, branch, remote, branch);
+				await this.git.update_ref(repoPath, `refs/remotes/${remote}/${branch.ref}`, remoteCommit?.[0] ?? '');
+				await this.git.branch__set_upstream(repoPath, branch.name, remote, branch.ref);
 				throw ex;
 			}