summaryrefslogtreecommitdiffstats
path: root/pkg/commands/sync.go
diff options
context:
space:
mode:
authorNathan Bell <nbell@lucidchart.com>2020-11-23 12:25:44 -0700
committerJesse Duffield <jessedduffield@gmail.com>2020-11-25 08:41:22 +1100
commite05c41828c7d70f207d9f1175c6c749646c4c361 (patch)
treed6d8e7075c90448b565e55ed501caab1c2862ad9 /pkg/commands/sync.go
parentc4cce584643776b06ac1b525e207bb25bcdf3241 (diff)
added tests and fixed bug found in tests
Diffstat (limited to 'pkg/commands/sync.go')
-rw-r--r--pkg/commands/sync.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/commands/sync.go b/pkg/commands/sync.go
index 8ebea010b..6f2c6207e 100644
--- a/pkg/commands/sync.go
+++ b/pkg/commands/sync.go
@@ -26,7 +26,9 @@ func (c *GitCommand) usingGpg() bool {
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 == "" {
+ if followsign == "false" {
+ followTagsFlag = ""
+ } else if followsign == "" {
followsign, _ = c.getGlobalGitConfig("push.followTags")
if followsign == "false" {
followTagsFlag = ""