Updates release notes generator

The git log is actually ``` commit <hash> Merge Pull Request ... <body> ``` Which is now parsed correctly Signed-off-by: Chuck Ha <chuckh@vmware.com>
kubernetes-sigs · Sep 6, 2019 · 9d741d1 · 9d741d1
1 parent 203d8f7
commit 9d741d1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/hack/tools/release/notes.go b/hack/tools/release/notes.go
@@ -99,13 +99,13 @@ func run() int {
 	for i := 0; i < len(outLines); i++ {
 		line := strings.TrimSpace(outLines[i])
 		switch {
-		case line == "":
+		case strings.HasPrefix(line, "commit"):
 			commits = append(commits, c)
 			c = commit{}
 		case strings.HasPrefix(line, "Merge"):
 			c.merge = line
-		case strings.HasPrefix(line, "commit"):
 			continue
+		case line == "":
 		default:
 			c.body = line
 		}
@@ -131,7 +131,10 @@ func run() int {
 		if key != unknown {
 			c.body = c.body[len(firstWord):]
 		}
-		c.body = fmt.Sprintf("    - %s", strings.TrimSpace(c.body))
+		if strings.TrimSpace(c.body) == "" {
+			continue
+		}
+		c.body = fmt.Sprintf("- %s", strings.TrimSpace(c.body))
 		fmt.Sscanf(c.merge, "Merge pull request %s from %s", &prNumber, &fork)
 		merges[key] = append(merges[key], formatMerge(c.body, prNumber))
 	}