Skip to content

Commit 99ce129

Browse files
authored
Fixed no git on system panic even if git flag is skip (#396)
1 parent 83092ca commit 99ce129

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

cmd/program/program.go

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -253,15 +253,17 @@ func (p *Project) CreateMainFile() error {
253253
}
254254

255255
// Check if user.email is set.
256-
emailSet, err := utils.CheckGitConfig("user.email")
257-
if err != nil {
258-
return err
259-
}
256+
if p.GitOptions.String() != flags.Skip {
260257

261-
if !emailSet && p.GitOptions.String() != flags.Skip {
262-
fmt.Println("user.email is not set in git config.")
263-
fmt.Println("Please set up git config before trying again.")
264-
panic("\nGIT CONFIG ISSUE: user.email is not set in git config.\n")
258+
emailSet, err := utils.CheckGitConfig("user.email")
259+
if err != nil {
260+
return err
261+
}
262+
if !emailSet {
263+
fmt.Println("user.email is not set in git config.")
264+
fmt.Println("Please set up git config before trying again.")
265+
panic("\nGIT CONFIG ISSUE: user.email is not set in git config.\n")
266+
}
265267
}
266268

267269
p.ProjectName = strings.TrimSpace(p.ProjectName)
@@ -283,7 +285,7 @@ func (p *Project) CreateMainFile() error {
283285
p.createFrameworkMap()
284286

285287
// Create go.mod
286-
err = utils.InitGoMod(p.ProjectName, projectPath)
288+
err := utils.InitGoMod(p.ProjectName, projectPath)
287289
if err != nil {
288290
log.Printf("Could not initialize go.mod in new project %v\n", err)
289291
return err
@@ -678,12 +680,12 @@ func (p *Project) CreateMainFile() error {
678680
return err
679681
}
680682

681-
nameSet, err := utils.CheckGitConfig("user.name")
682-
if err != nil {
683-
return err
684-
}
685-
686683
if p.GitOptions != flags.Skip {
684+
nameSet, err := utils.CheckGitConfig("user.name")
685+
if err != nil {
686+
return err
687+
}
688+
687689
if !nameSet {
688690
fmt.Println("user.name is not set in git config.")
689691
fmt.Println("Please set up git config before trying again.")

0 commit comments

Comments
 (0)