sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

Specifying branch name source from refs/heads for fast forwarding

Browse Source
This commit is contained in:
Neko Box Coder
2024-08-08 00:01:05 +01:00
committed by Stefan Haller
parent aa55995924
commit 6a418c65ca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/git_commands/sync.go
View File

@ -95,7 +95,7 @@ func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {
Arg("--no-edit"). Arg("--no-edit").
ArgIf(opts.FastForwardOnly, "--ff-only"). ArgIf(opts.FastForwardOnly, "--ff-only").
ArgIf(opts.RemoteName != "", opts.RemoteName). ArgIf(opts.RemoteName != "", opts.RemoteName).
ArgIf(opts.BranchName != "", opts.BranchName). ArgIf(opts.BranchName != "", "refs/heads/"+opts.BranchName).
GitDirIf(opts.WorktreeGitDir != "", opts.WorktreeGitDir). GitDirIf(opts.WorktreeGitDir != "", opts.WorktreeGitDir).
ToArgv() ToArgv()
@ -112,7 +112,7 @@ func (self *SyncCommands) FastForward(
) error { ) error {
cmdArgs := self.fetchCommandBuilder(false). cmdArgs := self.fetchCommandBuilder(false).
Arg(remoteName). Arg(remoteName).
Arg(remoteBranchName + ":" + branchName). Arg("refs/heads/" + remoteBranchName + ":" + branchName).
ToArgv() ToArgv()
return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run() return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()