Add an option to fetch tags

commit-id:9ca38713

config/config.go

@@ -35,6 +35,8 @@ type RepoConfig struct {
 	PRTemplateInsertEnd   string `yaml:"prTemplateInsertEnd,omitempty"`
 
 	MergeCheck string `yaml:"mergeCheck,omitempty"`
+
+	ForceFetchTags bool `default:"false" yaml:"forceFetchTags"`
 }
 
 type UserConfig struct {

git/mockgit/mockgit.go

@@ -65,7 +65,7 @@ type responder interface {
 }
 
 func (m *Mock) ExpectFetch() {
-	m.expect("git fetch --tags")
+	m.expect("git fetch")
 	m.expect("git branch --no-color").respond("* master")
 	m.expect("git rebase origin/master --autostash")
 }

readme.md

@@ -163,6 +163,8 @@ User specific configuration is saved to .spr.yml in the user home directory.
 | prTemplatePath        | str  |            | path to PR template (e.g. .github/PULL_REQUEST_TEMPLATE/pull_request_template.md) |
 | prTemplateInsertStart | str  |            | text to search for in PR template that determines body insert start location      |
 | prTemplateInsertEnd   | str  |            | text to search for in PR template that determines body insert end location        |
+| mergeCheck            | str  |            | enforce a pre-merge check using 'git spr check' |
+| forceFetchTags        | bool | false      | also fetch tags when running 'git spr update' |
 
 
 | User Config          | Type | Default | Description                                                       |

spr/spr.go

@@ -447,7 +447,11 @@ func commitsReordered(localCommits []git.Commit, pullRequests []*github.PullRequ
 }
 
 func (sd *stackediff) fetchAndGetGitHubInfo(ctx context.Context) *github.GitHubInfo {
-	sd.gitcmd.MustGit("fetch --tags", nil)
+	if sd.config.Repo.ForceFetchTags {
+		sd.gitcmd.MustGit("fetch --tags --force", nil)
+	} else {
+		sd.gitcmd.MustGit("fetch", nil)
+	}
 	targetBranch := git.GetRemoteBranchName(sd.config.Repo, sd.gitcmd)
 	rebaseCommand := fmt.Sprintf("rebase %s/%s --autostash",
 		sd.config.Repo.GitHubRemote, targetBranch)