diff options
Diffstat (limited to 'git-codereview/pending.go')
| -rw-r--r-- | git-codereview/pending.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-codereview/pending.go b/git-codereview/pending.go index f3e3369..0f61208 100644 --- a/git-codereview/pending.go +++ b/git-codereview/pending.go @@ -321,8 +321,12 @@ func formatCommit(w io.Writer, c *Commit, short bool) { case "ABANDONED": tags = append(tags, "abandoned") } - if c.Merge != "" { - tags = append(tags, "merge="+c.Merge[:7]) + if len(c.Parents) > 1 { + var h []string + for _, p := range c.Parents[1:] { + h = append(h, p[:7]) + } + tags = append(tags, "merge="+strings.Join(h, ",")) } if len(tags) > 0 { fmt.Fprintf(w, " (%s)", strings.Join(tags, ", ")) |