sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Add test demonstrating the problem with force-pushing in a triangular workflow

Browse Source 
Our code doesn't realize that we need to prompt the user to force push, when the
branch is up-to-date with its upstream but not with the branch that we're
pushing to.
This commit is contained in:
Stefan Haller
2024-05-17 21:07:38 +02:00
parent c4927e21c5
commit b91b40ba4d
3 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/integration/components/shell.go
View File

@ -194,6 +194,10 @@ func (self *Shell) CreateAnnotatedTag(name string, message string, ref string) *
return self.RunCommand([]string{"git", "tag", "-a", name, "-m", message, ref})
}
func (self *Shell) PushBranch(upstream, branch string) *Shell {
return self.RunCommand([]string{"git", "push", upstream, branch})
}
func (self *Shell) PushBranchAndSetUpstream(upstream, branch string) *Shell {
return self.RunCommand([]string{"git", "push", "--set-upstream", upstream, branch})
}