diff options
Diffstat (limited to 'git-codereview/pending.go')
| -rw-r--r-- | git-codereview/pending.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git-codereview/pending.go b/git-codereview/pending.go index c1594b5..f3e3369 100644 --- a/git-codereview/pending.go +++ b/git-codereview/pending.go @@ -293,6 +293,9 @@ func cmdPending(args []string) { // commit and its Gerrit state. func formatCommit(w io.Writer, c *Commit, short bool) { g := c.g + if g == nil { + g = new(GerritChange) + } msg := strings.TrimRight(c.Message, "\r\n") fmt.Fprintf(w, "%s", c.ShortHash) var tags []string @@ -318,6 +321,9 @@ 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(tags) > 0 { fmt.Fprintf(w, " (%s)", strings.Join(tags, ", ")) } |