Closes #4477 avoid set upstream unless names match

Author: eamodio

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Changed
+
+- Changes branch creation to avoid setting an upstream branch if the new branch name and remote branch name don't match ([#4477](https://github.com/gitkraken/vscode-gitlens/issues/4477))
+
 ## [17.3.0] - 2025-07-08
 
 ### Added

src/commands/git/branch.ts

@@ -379,18 +379,23 @@ export class BranchGitCommand extends QuickCommand {
 				state.reference = result;
 			}
 
+			const isRemoteBranch = isBranchReference(state.reference) && state.reference.remote;
+			const remoteBranchName = isRemoteBranch ? getReferenceNameWithoutRemote(state.reference) : undefined;
+
 			if (state.counter < 4 || state.name == null || state.suggestNameOnly) {
+				let value: string | undefined = state.name;
+				// if it's a remote branch, pre-fill the name (if it doesn't already exist)
+				if (!state.name && isRemoteBranch && !(await state.repo.git.branches.getBranch(remoteBranchName))) {
+					value = remoteBranchName;
+				}
+
 				const result = yield* inputBranchNameStep(state, context, {
 					title: `${context.title} from ${getReferenceLabel(state.reference, {
 						capitalize: true,
 						icon: false,
 						label: state.reference.refType !== 'branch',
 					})}`,
-					value:
-						state.name ?? // if it's a remote branch, pre-fill the name
-						(isBranchReference(state.reference) && state.reference.remote
-							? getReferenceNameWithoutRemote(state.reference)
-							: undefined),
+					value: value,
 				});
 				if (result === StepResultBreak) continue;
 
@@ -430,7 +435,11 @@ export class BranchGitCommand extends QuickCommand {
 				await state.repo.switch(state.reference.ref, { createBranch: state.name });
 			} else {
 				try {
-					await state.repo.git.branches.createBranch?.(state.name, state.reference.ref);
+					await state.repo.git.branches.createBranch?.(
+						state.name,
+						state.reference.ref,
+						isRemoteBranch && state.name !== remoteBranchName ? { noTracking: true } : undefined,
+					);
 				} catch (ex) {
 					Logger.error(ex, context.title);
 					// TODO likely need some better error handling here

src/env/node/git/sub-providers/branches.ts

@@ -441,9 +441,10 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 	}
 
 	@log()
-	async createBranch(repoPath: string, name: string, sha: string): Promise<void> {
+	async createBranch(repoPath: string, name: string, sha: string, options?: { noTracking?: boolean }): Promise<void> {
 		try {
-			await this.git.branch(repoPath, name, sha);
+			const args = options?.noTracking ? ['--no-track'] : [];
+			await this.git.branch(repoPath, name, sha, ...args);
 		} catch (ex) {
 			if (ex instanceof BranchError) {
 				throw ex.update({ branch: name, action: 'create' });

src/git/gitProvider.ts

@@ -249,7 +249,7 @@ export interface GitBranchesSubProvider {
 		cancellation?: CancellationToken,
 	): Promise<string | undefined>;
 
-	createBranch?(repoPath: string, name: string, sha: string): Promise<void>;
+	createBranch?(repoPath: string, name: string, sha: string, options?: { noTracking?: boolean }): Promise<void>;
 	deleteLocalBranch?(repoPath: string, name: string, options?: { force?: boolean }): Promise<void>;
 	deleteRemoteBranch?(repoPath: string, name: string, remote: string): Promise<void>;
 	/**