fix: push upstream

Author: Phil Stainer

src/commands/publish.ts

@@ -34,7 +34,7 @@ export const publish = async () => {
     if (!worktree)
       return showUserMessage('Warn', 'Aborted as no worktree was selected');
 
-    await pushNewBranchToRemote(worktree.path);
+    await pushNewBranchToRemote(worktree);
 
     showUserMessage(
       'Info',

src/commands/rename.ts

@@ -67,5 +67,5 @@ export const shouldPushWorktree = async (worktree: IWorktree) => {
     if (answer !== noYesAskOptions.yes) return;
   }
 
-  await pushNewBranchToRemote(worktree.path);
+  await pushNewBranchToRemote(worktree);
 };

src/helpers/general.ts

@@ -6,7 +6,7 @@ import type {
 import { basename } from 'path';
 import * as util from 'util';
 import { workspace } from 'vscode';
-import { loggingOptions, loggingOptionValue } from '../config/constants';
+import { loggingOptionValue, loggingOptions } from '../config/constants';
 import { globalState } from '../extension';
 import { isExistingDirectory } from './file';
 

src/helpers/git.ts

@@ -1,3 +1,4 @@
+import { type IWorktree } from '#/@types/worktree';
 import {
   BARE_REPOSITORY,
   BARE_REPOSITORY_REMOTE_ORIGIN_FETCH,
@@ -148,9 +149,9 @@ export const getRemoteBranches = async (): Promise<string[]> => {
   }
 };
 
-export const pushNewBranchToRemote = async (path: string) => {
+export const pushNewBranchToRemote = async ({ path, worktree }: IWorktree) => {
   try {
-    const command = `git -C ${path} push -u origin`;
+    const command = `git -C ${path} push --set-upstream origin ${worktree}`;
     await executeCommand(command);
   } catch (e: any) {
     throw Error(e);

src/helpers/worktree/addNewWorktree.ts

@@ -4,7 +4,7 @@ import { calculateNewWorktreePath } from './calculateNewWorktreePath';
 
 export const addNewWorktree = async (
   newBranch: string,
-  trackingBranch?: string
+  trackingBranch: string
 ) => {
   const isExistingBranch = await checkIfBranchExistsOnRemote(newBranch);
   if (isExistingBranch)
@@ -15,10 +15,9 @@ export const addNewWorktree = async (
   const newWorktree = { worktree: newBranch, path: newWorktreePath };
 
   try {
-    const addCommand = `git worktree add -B ${newBranch} ${newWorktreePath}`;
-    const addCommandWithTracking = `git worktree add --track -B ${newBranch} ${newWorktreePath} origin/${trackingBranch}`;
+    const addCommand = `git worktree add --track -B ${newBranch} ${newWorktreePath} origin/${trackingBranch}`;
 
-    await executeCommand(trackingBranch ? addCommandWithTracking : addCommand);
+    await executeCommand(addCommand);
 
     return newWorktree;
   } catch (e: any) {

src/helpers/worktree/shouldPushWorktree.ts

@@ -25,8 +25,8 @@ export const shouldPushWorktree = async (
     if (!answer) return;
     if (answer === noYesWindowOptions.no) return;
 
-    return pushNewBranchToRemote(worktree.path);
+    return pushNewBranchToRemote(worktree);
   }
 
-  pushNewBranchToRemote(worktree.path);
+  pushNewBranchToRemote(worktree);
 };