aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--bug/op_edit_comment.go2
-rw-r--r--bug/op_label_change.go2
-rw-r--r--bug/op_noop.go2
-rw-r--r--bug/op_set_metadata.go2
-rw-r--r--bug/op_set_status.go2
-rw-r--r--bug/op_set_title.go2
-rw-r--r--doc/man/git-bug-comment-edit.12
-rw-r--r--doc/md/git-bug_comment_edit.md2
-rw-r--r--entity/err.go2
10 files changed, 10 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 012dadcd..be1fc3f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ git-bug
dist
coverage.txt
.idea/
+.git_bak*
diff --git a/bug/op_edit_comment.go b/bug/op_edit_comment.go
index f9e30e62..e08aeaad 100644
--- a/bug/op_edit_comment.go
+++ b/bug/op_edit_comment.go
@@ -96,7 +96,7 @@ func (op *EditCommentOperation) Validate() error {
return nil
}
-// UnmarshalJSON is a two step JSON unmarshaling
+// UnmarshalJSON is a two step JSON unmarshalling
// This workaround is necessary to avoid the inner OpBase.MarshalJSON
// overriding the outer op's MarshalJSON
func (op *EditCommentOperation) UnmarshalJSON(data []byte) error {
diff --git a/bug/op_label_change.go b/bug/op_label_change.go
index 5e51534d..d682fe54 100644
--- a/bug/op_label_change.go
+++ b/bug/op_label_change.go
@@ -95,7 +95,7 @@ func (op *LabelChangeOperation) Validate() error {
return nil
}
-// UnmarshalJSON is a two step JSON unmarshaling
+// UnmarshalJSON is a two step JSON unmarshalling
// This workaround is necessary to avoid the inner OpBase.MarshalJSON
// overriding the outer op's MarshalJSON
func (op *LabelChangeOperation) UnmarshalJSON(data []byte) error {
diff --git a/bug/op_noop.go b/bug/op_noop.go
index d59666ae..81efdb25 100644
--- a/bug/op_noop.go
+++ b/bug/op_noop.go
@@ -31,7 +31,7 @@ func (op *NoOpOperation) Validate() error {
return op.OpBase.Validate(op, NoOpOp)
}
-// UnmarshalJSON is a two step JSON unmarshaling
+// UnmarshalJSON is a two step JSON unmarshalling
// This workaround is necessary to avoid the inner OpBase.MarshalJSON
// overriding the outer op's MarshalJSON
func (op *NoOpOperation) UnmarshalJSON(data []byte) error {
diff --git a/bug/op_set_metadata.go b/bug/op_set_metadata.go
index c4988b84..4e596728 100644
--- a/bug/op_set_metadata.go
+++ b/bug/op_set_metadata.go
@@ -49,7 +49,7 @@ func (op *SetMetadataOperation) Validate() error {
return nil
}
-// UnmarshalJSON is a two step JSON unmarshaling
+// UnmarshalJSON is a two step JSON unmarshalling
// This workaround is necessary to avoid the inner OpBase.MarshalJSON
// overriding the outer op's MarshalJSON
func (op *SetMetadataOperation) UnmarshalJSON(data []byte) error {
diff --git a/bug/op_set_status.go b/bug/op_set_status.go
index fcf33f8c..ca8c434a 100644
--- a/bug/op_set_status.go
+++ b/bug/op_set_status.go
@@ -51,7 +51,7 @@ func (op *SetStatusOperation) Validate() error {
return nil
}
-// UnmarshalJSON is a two step JSON unmarshaling
+// UnmarshalJSON is a two step JSON unmarshalling
// This workaround is necessary to avoid the inner OpBase.MarshalJSON
// overriding the outer op's MarshalJSON
func (op *SetStatusOperation) UnmarshalJSON(data []byte) error {
diff --git a/bug/op_set_title.go b/bug/op_set_title.go
index 7fd7c20d..899b4fa3 100644
--- a/bug/op_set_title.go
+++ b/bug/op_set_title.go
@@ -71,7 +71,7 @@ func (op *SetTitleOperation) Validate() error {
return nil
}
-// UnmarshalJSON is a two step JSON unmarshaling
+// UnmarshalJSON is a two step JSON unmarshalling
// This workaround is necessary to avoid the inner OpBase.MarshalJSON
// overriding the outer op's MarshalJSON
func (op *SetTitleOperation) UnmarshalJSON(data []byte) error {
diff --git a/doc/man/git-bug-comment-edit.1 b/doc/man/git-bug-comment-edit.1
index e3cb2daf..741743a6 100644
--- a/doc/man/git-bug-comment-edit.1
+++ b/doc/man/git-bug-comment-edit.1
@@ -8,7 +8,7 @@ git\-bug\-comment\-edit \- Edit an existing comment on a bug.
.SH SYNOPSIS
.PP
-\fBgit\-bug comment edit [flags]\fP
+\fBgit\-bug comment edit [COMMENT\_ID] [flags]\fP
.SH DESCRIPTION
diff --git a/doc/md/git-bug_comment_edit.md b/doc/md/git-bug_comment_edit.md
index 2546dff1..26571927 100644
--- a/doc/md/git-bug_comment_edit.md
+++ b/doc/md/git-bug_comment_edit.md
@@ -3,7 +3,7 @@
Edit an existing comment on a bug.
```
-git-bug comment edit <commentid> [flags]
+git-bug comment edit [COMMENT_ID] [flags]
```
### Options
diff --git a/entity/err.go b/entity/err.go
index 9222e4da..9f7f5a1a 100644
--- a/entity/err.go
+++ b/entity/err.go
@@ -52,7 +52,7 @@ func NewErrUnknowFormat(expected uint) *ErrInvalidFormat {
func (e ErrInvalidFormat) Error() string {
if e.version == 0 {
- return fmt.Sprintf("unreadable data, expected format version %v", e.expected)
+ return fmt.Sprintf("unreadable data, you likely have an outdated repository format, please use https://github.com/MichaelMure/git-bug-migration to upgrade to format version %v", e.expected)
}
if e.version < e.expected {
return fmt.Sprintf("outdated repository format %v, please use https://github.com/MichaelMure/git-bug-migration to upgrade to format version %v", e.version, e.expected)