mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Specifying branch name source from refs/heads for fast forwarding (#3807)

Browse source 
- **PR Description**
This fixes #2625
This commit is contained in:
Stefan Haller 2024-08-18 10:45:42 +02:00 • committed by GitHub
commit 7679b109cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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()