Use right syntax for symbolic-ref command (#21577)

clarfonthey · lunny · web-flow · commit 76e9a4f70188 · 2022-10-28T09:41:09.000-04:00
Follow-up to #21352: when testing this out, I found out that the syntax for the `symbolic-ref` command was different than originally assumed in that PR. Never got around to submitting a PR until now. Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
diff --git a/modules/doctor/heads.go b/modules/doctor/heads.go
@@ -49,7 +49,7 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool)
 		}
 
 		// otherwise, let's try fixing HEAD
-		err := git.NewCommand(ctx, "symbolic-ref").AddDashesAndList("HEAD", repo.DefaultBranch).Run(runOpts)
+		err := git.NewCommand(ctx, "symbolic-ref").AddDashesAndList("HEAD", git.BranchPrefix+repo.DefaultBranch).Run(runOpts)
 		if err != nil {
 			logger.Warn("Failed to fix HEAD for %s/%s: %v", repo.OwnerName, repo.Name, err)
 			return nil

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// otherwise, let's try fixing HEAD`
`52`		`- err := git.NewCommand(ctx, "symbolic-ref").AddDashesAndList("HEAD", repo.DefaultBranch).Run(runOpts)`
	`52`	`+ err := git.NewCommand(ctx, "symbolic-ref").AddDashesAndList("HEAD", git.BranchPrefix+repo.DefaultBranch).Run(runOpts)`
`53`	`53`	`if err != nil {`
`54`	`54`	`logger.Warn("Failed to fix HEAD for %s/%s: %v", repo.OwnerName, repo.Name, err)`
`55`	`55`	`return nil`