diff options
| author | Michael Muré <batolettre@gmail.com> | 2018-09-19 21:45:04 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2018-09-19 21:45:52 +0200 |
| commit | d57e2fdd1977b9a5d4984d7146e66349001893b3 (patch) | |
| tree | bc58dcabc197929894c3d88ec2af56385b80e9de | |
| parent | 1060acfd533c30ddcd31e4c0431d36e410e011e9 (diff) | |
| download | git-bug-d57e2fdd1977b9a5d4984d7146e66349001893b3.tar.gz | |
commands: fix a panic on merge invalid
| -rw-r--r-- | bug/bug.go | 6 | ||||
| -rw-r--r-- | commands/pull.go | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -576,8 +576,12 @@ func (bug *Bug) Id() string { // HumanId return the Bug identifier truncated for human consumption func (bug *Bug) HumanId() string { + return FormatHumanID(bug.Id()) +} + +func FormatHumanID(id string) string { format := fmt.Sprintf("%%.%ds", humanIdLength) - return fmt.Sprintf(format, bug.Id()) + return fmt.Sprintf(format, id) } // CreateLamportTime return the Lamport time of creation diff --git a/commands/pull.go b/commands/pull.go index 64dd83fe..73a27d3d 100644 --- a/commands/pull.go +++ b/commands/pull.go @@ -42,7 +42,7 @@ func runPull(cmd *cobra.Command, args []string) error { } if merge.Status != bug.MergeStatusNothing { - fmt.Printf("%s: %s\n", merge.Bug.HumanId(), merge) + fmt.Printf("%s: %s\n", bug.FormatHumanID(merge.Id), merge) } } |