1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00

Allow --follow-tags to be disabled if push.followTags is configured to false

This commit is contained in:
Nathan Bell 2020-11-23 12:04:15 -07:00 committed by Jesse Duffield
parent f7e6d4e724
commit c4cce58464

View File

@ -24,6 +24,15 @@ func (c *GitCommand) usingGpg() bool {
// Push pushes to a branch
func (c *GitCommand) Push(branchName string, force bool, upstream string, args string, promptUserForCredential func(string) string) error {
followTagsFlag := "--follow-tags"
followsign, _ := c.getLocalGitConfig("push.followTags")
if followsign == "" {
followsign, _ = c.getGlobalGitConfig("push.followTags")
if followsign == "false" {
followTagsFlag = ""
}
}
forceFlag := ""
if force {
forceFlag = "--force-with-lease"
@ -34,7 +43,7 @@ func (c *GitCommand) Push(branchName string, force bool, upstream string, args s
setUpstreamArg = "--set-upstream " + upstream
}
cmd := fmt.Sprintf("git push --follow-tags %s %s %s", forceFlag, setUpstreamArg, args)
cmd := fmt.Sprintf("git push %s %s %s %s", followTagsFlag, forceFlag, setUpstreamArg, args)
return c.OSCommand.DetectUnamePass(cmd, promptUserForCredential)
}