fresh start

cmd/lakectl/cmd/log.go

@@ -66,6 +66,19 @@ func (d *dotWriter) Write(commits []apigen.Commit) {
 	}
 }
 
+// filter merge commits, used for --no-merges flag
+func filterMergeCommits(commits []apigen.Commit) []apigen.Commit {
+	var filteredCommits []apigen.Commit
+
+	// iterating through data.Commit, appending every instance with 1 or less parents.
+	for _, commit := range commits {
+		if len(commit.Parents) <= 1 {
+			filteredCommits = append(filteredCommits, commit)
+		}
+	}
+	return filteredCommits
+}
+
 // logCmd represents the log command
 var logCmd = &cobra.Command{
 	Use:               "log <branch URI>",
@@ -80,6 +93,7 @@ var logCmd = &cobra.Command{
 		limit := Must(cmd.Flags().GetBool("limit"))
 		since := Must(cmd.Flags().GetString("since"))
 		dot := Must(cmd.Flags().GetBool("dot"))
+		noMerges := Must(cmd.Flags().GetBool("no-merges"))
 		firstParent := Must(cmd.Flags().GetBool("first-parent"))
 		objects := Must(cmd.Flags().GetStringSlice("objects"))
 		prefixes := Must(cmd.Flags().GetStringSlice("prefixes"))
@@ -150,6 +164,9 @@ var logCmd = &cobra.Command{
 					After:   pagination.NextOffset,
 				},
 			}
+			if noMerges {
+				data.Commits = filterMergeCommits(data.Commits)
+			}
 
 			if dot {
 				graph.Write(data.Commits)
@@ -177,6 +194,7 @@ func init() {
 	logCmd.Flags().String("after", "", "show results after this value (used for pagination)")
 	logCmd.Flags().Bool("dot", false, "return results in a dotgraph format")
 	logCmd.Flags().Bool("first-parent", false, "follow only the first parent commit upon seeing a merge commit")
+	logCmd.Flags().Bool("no-merges", false, "skip merge commits")
 	logCmd.Flags().Bool("show-meta-range-id", false, "also show meta range ID")
 	logCmd.Flags().StringSlice("objects", nil, "show results that contains changes to at least one path in that list of objects. Use comma separator to pass all objects together")
 	logCmd.Flags().StringSlice("prefixes", nil, "show results that contains changes to at least one path in that list of prefixes. Use comma separator to pass all prefixes together")