From c8ff32c63674f7f7c9af6264c5043338c8430210 Mon Sep 17 00:00:00 2001 From: kygr Date: Thu, 3 Nov 2022 20:32:56 +0100 Subject: [PATCH] fix: dont set origin prefix 2 times --- lua/git-worktree/init.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lua/git-worktree/init.lua b/lua/git-worktree/init.lua index 0fb5295..caebd03 100644 --- a/lua/git-worktree/init.lua +++ b/lua/git-worktree/init.lua @@ -174,9 +174,15 @@ local function create_worktree_job(path, branch, found_branch) local worktree_add_args = {'worktree', 'add'} if not found_branch then - table.insert(worktree_add_args, '-b') - table.insert(worktree_add_args, branch) - table.insert(worktree_add_args, path) + if branch:find('^origin/') then + table.insert(worktree_add_args, path) + local local_branch_name = branch:gsub("origin/", "") + table.insert(worktree_add_args, local_branch_name) + else + table.insert(worktree_add_args, '-b') + table.insert(worktree_add_args, branch) + table.insert(worktree_add_args, path) + end else table.insert(worktree_add_args, path) table.insert(worktree_add_args, branch)