Add --all to "git fetch" command when not fetching a specific remote

jesseduffield · Jun 1, 2023 · 31a2ea1 · 31a2ea1
1 parent 697157f
commit 31a2ea1
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/docs/Config.md b/docs/Config.md
@@ -94,6 +94,7 @@ git:
  mainBranches: [master, main]
  autoFetch: true
  autoRefresh: true
+ fetchAll: true # Pass --all flag when running git fetch. Set to false to fetch only origin (or the current branch's upstream remote if there is one)
  branchLogCmd: 'git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --'
  allBranchesLogCmd: 'git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium'
  overrideGpg: false # prevents lazygit from spawning a separate process when using GPG

diff --git a/pkg/commands/git_commands/sync.go b/pkg/commands/git_commands/sync.go
@@ -54,7 +54,9 @@ type FetchOptions struct {
 
 // Fetch fetch git repo
 func (self *SyncCommands) FetchCmdObj(opts FetchOptions) oscommands.ICmdObj {
- cmdArgs := NewGitCmd("fetch").ToArgv()
+ cmdArgs := NewGitCmd("fetch").
+ ArgIf(self.UserConfig.Git.FetchAll, "--all").
+ ToArgv()
 
  cmdObj := self.cmd.New(cmdArgs)
  if opts.Background {

diff --git a/pkg/commands/git_commands/sync_test.go b/pkg/commands/git_commands/sync_test.go
@@ -95,36 +95,60 @@ func TestSyncPush(t *testing.T) {
 
 func TestSyncFetch(t *testing.T) {
  type scenario struct {
- testName string
- opts FetchOptions
- test func(oscommands.ICmdObj)
+ testName string
+ opts FetchOptions
+ fetchAllConfig bool
+ test func(oscommands.ICmdObj)
  }
 
  scenarios := []scenario{
  {
- testName: "Fetch in foreground",
- opts: FetchOptions{Background: false},
+ testName: "Fetch in foreground (all=false)",
+ opts: FetchOptions{Background: false},
+ fetchAllConfig: false,
  test: func(cmdObj oscommands.ICmdObj) {
  assert.True(t, cmdObj.ShouldLog())
  assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.PROMPT)
  assert.Equal(t, cmdObj.Args(), []string{"git", "fetch"})
  },
  },
  {
- testName: "Fetch in background",
- opts: FetchOptions{Background: true},
+ testName: "Fetch in foreground (all=true)",
+ opts: FetchOptions{Background: false},
+ fetchAllConfig: true,
+ test: func(cmdObj oscommands.ICmdObj) {
+ assert.True(t, cmdObj.ShouldLog())
+ assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.PROMPT)
+ assert.Equal(t, cmdObj.Args(), []string{"git", "fetch", "--all"})
+ },
+ },
+ {
+ testName: "Fetch in background (all=false)",
+ opts: FetchOptions{Background: true},
+ fetchAllConfig: false,
  test: func(cmdObj oscommands.ICmdObj) {
  assert.False(t, cmdObj.ShouldLog())
  assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.FAIL)
  assert.Equal(t, cmdObj.Args(), []string{"git", "fetch"})
  },
  },
+ {
+ testName: "Fetch in background (all=true)",
+ opts: FetchOptions{Background: true},
+ fetchAllConfig: true,
+ test: func(cmdObj oscommands.ICmdObj) {
+ assert.False(t, cmdObj.ShouldLog())
+ assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.FAIL)
+ assert.Equal(t, cmdObj.Args(), []string{"git", "fetch", "--all"})
+ },
+ },
  }
 
  for _, s := range scenarios {
  s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildSyncCommands(commonDeps{})
+ instance.UserConfig.Git.FetchAll = s.fetchAllConfig
  s.test(instance.FetchCmdObj(s.opts))
  })
  }

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
@@ -81,6 +81,7 @@ type GitConfig struct {
  SkipHookPrefix string `yaml:"skipHookPrefix"`
  AutoFetch bool `yaml:"autoFetch"`
  AutoRefresh bool `yaml:"autoRefresh"`
+ FetchAll bool `yaml:"fetchAll"`
  BranchLogCmd string `yaml:"branchLogCmd"`
  AllBranchesLogCmd string `yaml:"allBranchesLogCmd"`
  OverrideGpg bool `yaml:"overrideGpg"`
@@ -453,6 +454,7 @@ func GetDefaultConfig() *UserConfig {
  MainBranches: []string{"master", "main"},
  AutoFetch: true,
  AutoRefresh: true,
+ FetchAll: true,
  BranchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --",
  AllBranchesLogCmd: "git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium",
  DisableForcePushing: false,