review feedback

vilmibm · vilmibm · commit 2d90c09f480b · 2020-03-16T15:32:35.000-05:00
diff --git a/command/pr_create.go b/command/pr_create.go
@@ -38,9 +38,9 @@ func computeDefaults(baseRef, headRef string) (defaults, error) {
 	} else {
 		out.Title = headRef // TODO format or something?
 
-		body := fmt.Sprintf("---\n%d commits:\n\n", len(commits))
+		body := ""
 		for _, c := range commits {
-			body += fmt.Sprintf("- %s %s\n", c.Sha[0:5], c.Title)
+			body += fmt.Sprintf("- %s\n", c.Title)
 		}
 		out.Body = body
 	}
@@ -103,7 +103,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {
 
 	defs, err := computeDefaults(baseBranch, headBranch)
 	if err != nil {
-		return fmt.Errorf("could not compute title or body defaults:  %w", err)
+		fmt.Fprintf(colorableErr(cmd), "%s warning: could not compute title or body defaults:  %w\n", utils.Yellow("!"), err)
 	}
 
 	isWeb, err := cmd.Flags().GetBool("web")
diff --git a/command/pr_create_test.go b/command/pr_create_test.go
@@ -245,7 +245,7 @@ func TestPRCreate_survey_defaults_multicommit(t *testing.T) {
 	}{}
 	json.Unmarshal(bodyBytes, &reqBody)
 
-	expectedBody := "---\n2 commits:\n\n- 12345 commit 0\n- 23456 commit 1\n"
+	expectedBody := "- commit 0\n- commit 1\n"
 
 	eq(t, reqBody.Variables.Input.RepositoryID, "REPOID")
 	eq(t, reqBody.Variables.Input.Title, "feature")
@@ -322,22 +322,3 @@ func TestPRCreate_survey_defaults_monocommit(t *testing.T) {
 
 	eq(t, output.String(), "https://github.com/OWNER/REPO/pull/12\n")
 }
-
-func TestPRCreate_survey_defaults_no_changes(t *testing.T) {
-	initBlankContext("OWNER/REPO", "feature")
-
-	http := initFakeHTTP()
-	http.StubRepoResponse("OWNER", "REPO")
-
-	cs, cmdTeardown := initCmdStubber()
-	defer cmdTeardown()
-
-	cs.Stub("") // git status
-	cs.Stub("") // git log
-
-	_, err := RunCommand(prCreateCmd, `pr create`)
-	if err == nil {
-		t.Error("expected error")
-	}
-	eq(t, err.Error(), "could not compute title or body defaults:  could not find any commits between master and feature")
-}
diff --git a/command/title_body_survey.go b/command/title_body_survey.go
@@ -27,7 +27,7 @@ var SurveyAsk = func(qs []*survey.Question, response interface{}, opts ...survey
 	return survey.Ask(qs, response, opts...)
 }
 
-var ConfirmSubmission = func() (Action, error) {
+func confirmSubmission() (Action, error) {
 	confirmAnswers := struct {
 		Confirmation int
 	}{}
@@ -53,7 +53,7 @@ var ConfirmSubmission = func() (Action, error) {
 	return Action(confirmAnswers.Confirmation), nil
 }
 
-var SelectTemplate = func(templatePaths []string) (string, error) {
+func selectTemplate(templatePaths []string) (string, error) {
 	templateResponse := struct {
 		Index int
 	}{}
@@ -89,7 +89,7 @@ func titleBodySurvey(cmd *cobra.Command, providedTitle, providedBody string, def
 	if providedBody == "" {
 		if len(templatePaths) > 0 {
 			var err error
-			templateContents, err = SelectTemplate(templatePaths)
+			templateContents, err = selectTemplate(templatePaths)
 			if err != nil {
 				return nil, err
 			}
@@ -136,7 +136,7 @@ func titleBodySurvey(cmd *cobra.Command, providedTitle, providedBody string, def
 		inProgress.Body = templateContents
 	}
 
-	confirmA, err := ConfirmSubmission()
+	confirmA, err := confirmSubmission()
 	if err != nil {
 		return nil, fmt.Errorf("unable to confirm: %w", err)
 	}
diff --git a/git/git.go b/git/git.go
@@ -78,8 +78,9 @@ type Commit struct {
 
 func Commits(baseRef, headRef string) ([]*Commit, error) {
 	logCmd := GitCommand(
+		"-c", "log.ShowSignature=false",
 		"log", "--pretty=format:%H,%s",
-		fmt.Sprintf("%s..%s", baseRef, headRef))
+		"--cherry", fmt.Sprintf("%s...%s", baseRef, headRef))
 	output, err := utils.PrepareCmd(logCmd).Output()
 	if err != nil {
 		return []*Commit{}, err
@@ -107,7 +108,7 @@ func Commits(baseRef, headRef string) ([]*Commit, error) {
 }
 
 func CommitBody(sha string) (string, error) {
-	showCmd := GitCommand("show", "-s", "--pretty=format:%b", sha)
+	showCmd := GitCommand("-c", "log.ShowSignature=false", "show", "-s", "--pretty=format:%b", sha)
 	output, err := utils.PrepareCmd(showCmd).Output()
 	if err != nil {
 		return "", err

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ func computeDefaults(baseRef, headRef string) (defaults, error) {`
`38`	`38`	`} else {`
`39`	`39`	`out.Title = headRef // TODO format or something?`
`40`	`40`
`41`		`- body := fmt.Sprintf("---\n%d commits:\n\n", len(commits))`
	`41`	`+ body := ""`
`42`	`42`	`for _, c := range commits {`
`43`		`- body += fmt.Sprintf("- %s %s\n", c.Sha[0:5], c.Title)`
	`43`	`+ body += fmt.Sprintf("- %s\n", c.Title)`
`44`	`44`	`}`
`45`	`45`	`out.Body = body`
`46`	`46`	`}`
`@@ -103,7 +103,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {`
`103`	`103`
`104`	`104`	`defs, err := computeDefaults(baseBranch, headBranch)`
`105`	`105`	`if err != nil {`
`106`		`- return fmt.Errorf("could not compute title or body defaults: %w", err)`
	`106`	`+ fmt.Fprintf(colorableErr(cmd), "%s warning: could not compute title or body defaults: %w\n", utils.Yellow("!"), err)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`isWeb, err := cmd.Flags().GetBool("web")`