Skip to content

Commit

Permalink
minor wording changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephanie You committed Jan 25, 2024
1 parent 2a7d288 commit becbce6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions go/cmd/dolt/commands/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ func logCompact(pager *outputpager.Pager, apr *argparser.ArgParseResults, commit
pager.Writer.Write([]byte(formattedDesc))

if apr.Contains(cli.StatFlag) {
if comm.parentHashes != nil && len(comm.parentHashes) == 1 {
if comm.parentHashes != nil && len(comm.parentHashes) == 1 { // don't print stats for merge commits
diffStats := make(map[string]*merge.MergeStats)
diffStats, _, err := calculateMergeStats(queryist, sqlCtx, diffStats, comm.parentHashes[0], comm.commitHash)
if err != nil {
Expand All @@ -333,7 +333,7 @@ func logDefault(pager *outputpager.Pager, apr *argparser.ArgParseResults, commit
for _, comm := range commits {
PrintCommitInfo(pager, apr.GetIntOrDefault(cli.MinParentsFlag, 0), apr.Contains(cli.ParentsFlag), apr.GetValueOrDefault(cli.DecorateFlag, "auto"), &comm)
if apr.Contains(cli.StatFlag) {
if comm.parentHashes != nil && len(comm.parentHashes) == 1 {
if comm.parentHashes != nil && len(comm.parentHashes) == 1 { // don't print stats for merge commits
diffStats := make(map[string]*merge.MergeStats)
diffStats, _, err := calculateMergeStats(queryist, sqlCtx, diffStats, comm.parentHashes[0], comm.commitHash)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/dolt/commands/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ func calculateMergeConflicts(queryist cli.Queryist, sqlCtx *sql.Context, mergeSt
}

// calculateMergeStats calculates the table operations and row operations that occurred during the merge. Returns a map of
// table name to MergeStats and a bool representing whether all tables were unmodified.
// table name to MergeStats and a bool set to TRUE if all tables are unmodified.
func calculateMergeStats(queryist cli.Queryist, sqlCtx *sql.Context, mergeStats map[string]*merge.MergeStats, fromRef, toRef string) (map[string]*merge.MergeStats, bool, error) {
diffSummaries, err := getDiffSummariesBetweenRefs(queryist, sqlCtx, fromRef, toRef)
if err != nil {
Expand Down

0 comments on commit becbce6

Please sign in to comment.