diff options
| author | Steve Moyer <smoyer1@selesy.com> | 2022-08-23 10:33:19 -0400 |
|---|---|---|
| committer | Steve Moyer <smoyer1@selesy.com> | 2022-08-23 10:33:19 -0400 |
| commit | 7ba98bfadc2c4c7fd3e777074976b78d6171b163 (patch) | |
| tree | 4865a84837a016e9a18b566046a2aa7a1992acc7 /commands/show.go | |
| parent | 2c2c449187557384fd1e5b9333e808451be86041 (diff) | |
| parent | 5a70e8b3a2e0fe3d1a1dcd4c24bb6bf64633cb7f (diff) | |
| download | git-bug-7ba98bfadc2c4c7fd3e777074976b78d6171b163.tar.gz | |
Merge branch 'master' into fix-850-ineffective-comment-edit
Diffstat (limited to 'commands/show.go')
| -rw-r--r-- | commands/show.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/commands/show.go b/commands/show.go index 16747214..1491372e 100644 --- a/commands/show.go +++ b/commands/show.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/MichaelMure/git-bug/bug" _select "github.com/MichaelMure/git-bug/commands/select" + "github.com/MichaelMure/git-bug/entities/bug" "github.com/MichaelMure/git-bug/util/colors" ) @@ -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, } |