diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-05-03 11:45:15 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2022-08-22 13:25:26 +0200 |
| commit | 45b04351d8d02e53b3401b0ee23f7cbe750b63cd (patch) | |
| tree | 59d203ef6c0f6a497b7074cd5617c8869cac3b14 /commands | |
| parent | 43026fc53669d462a60feec7d22aec090959be72 (diff) | |
| download | git-bug-45b04351d8d02e53b3401b0ee23f7cbe750b63cd.tar.gz | |
bug: have a type for combined ids, fix https://github.com/MichaelMure/git-bug/issues/653
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/comment.go | 2 | ||||
| -rw-r--r-- | commands/show.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/commands/comment.go b/commands/comment.go index b4b4628b..7cab447c 100644 --- a/commands/comment.go +++ b/commands/comment.go @@ -41,7 +41,7 @@ func runComment(env *Env, args []string) error { } env.out.Printf("Author: %s\n", colors.Magenta(comment.Author.DisplayName())) - env.out.Printf("Id: %s\n", colors.Cyan(comment.Id().Human())) + env.out.Printf("Id: %s\n", colors.Cyan(comment.CombinedId().Human())) env.out.Printf("Date: %s\n\n", comment.FormatTime()) env.out.Println(text.LeftPadLines(comment.Message, 4)) } diff --git a/commands/show.go b/commands/show.go index d145ffe7..1491372e 100644 --- a/commands/show.go +++ b/commands/show.go @@ -163,7 +163,7 @@ func showDefaultFormatter(env *Env, snapshot *bug.Snapshot) error { var message string env.out.Printf("%s%s #%d %s <%s>\n\n", indent, - comment.Id().Human(), + comment.CombinedId().Human(), i, comment.Author.DisplayName(), comment.Author.Email(), @@ -207,8 +207,8 @@ type JSONComment struct { func NewJSONComment(comment bug.Comment) JSONComment { return JSONComment{ - Id: comment.Id().String(), - HumanId: comment.Id().Human(), + Id: comment.CombinedId().String(), + HumanId: comment.CombinedId().Human(), Author: NewJSONIdentity(comment.Author), Message: comment.Message, } |