Merge pull request cli#497 from ShahzadUmair/fix-template

Explicitly replace empty body with default template
tinyxt · Feb 19, 2020 · f6c9e7b · f6c9e7b
2 parents f6856d9 + 12216fe
commit f6c9e7b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/command/title_body_survey.go b/command/title_body_survey.go
@@ -79,9 +79,11 @@ func selectTemplate(templatePaths []string) (string, error) {
 
 func titleBodySurvey(cmd *cobra.Command, providedTitle string, providedBody string, templatePaths []string) (*titleBody, error) {
 	inProgress := titleBody{}
+	templateContents := ""
 
 	if providedBody == "" && len(templatePaths) > 0 {
-		templateContents, err := selectTemplate(templatePaths)
+		var err error
+		templateContents, err = selectTemplate(templatePaths)
 		if err != nil {
 			return nil, err
 		}
@@ -121,6 +123,10 @@ func titleBodySurvey(cmd *cobra.Command, providedTitle string, providedBody stri
 		return nil, fmt.Errorf("could not prompt: %w", err)
 	}
 
+	if inProgress.Body == "" {
+		inProgress.Body = templateContents
+	}
+
 	confirmA, err := confirm()
 	if err != nil {
 		return nil, fmt.Errorf("unable to confirm: %w", err)