Skip to content

Fix error when there is only 1 commit #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucapino-kobalt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix error when there is only 1 commit #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions notifier/github/commits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func (g *CommitsService) lastOne(commits []string, revision string) (string, err
if revision == "" {
return "", errors.New("no revision specified")
}
if len(commits) == 0 {
return "", errors.New("no commits")
if len(commits) < 2 {
return "", errors.New("not enough commits")
}
// e.g.
// a0ce5bf 2018/04/05 20:50:01 (HEAD -> master, origin/master)
Expand Down
9 changes: 9 additions & 0 deletions notifier/github/commits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ func TestCommitsLastOne(t *testing.T) {
lastRev: "",
ok: false,
},
{
// one commit
commits: []string{
"04e0917e448b662c2b16330fad50e97af16ff27a",
},
revision: "04e0917e448b662c2b16330fad50e97af16ff27a",
lastRev: "",
ok: false,
},
}

for _, testCase := range testCases {
Expand Down
4 changes: 2 additions & 2 deletions notifier/gitlab/commits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ func (g *CommitsService) lastOne(commits []string, revision string) (string, err
if revision == "" {
return "", errors.New("no revision specified")
}
if len(commits) == 0 {
return "", errors.New("no commits")
if len(commits) < 2 {
return "", errors.New("not enough commits")
}

return commits[1], nil
Expand Down
9 changes: 9 additions & 0 deletions notifier/gitlab/commits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ func TestCommitsLastOne(t *testing.T) {
lastRev: "",
ok: false,
},
{
// one commit
commits: []string{
"04e0917e448b662c2b16330fad50e97af16ff27a",
},
revision: "04e0917e448b662c2b16330fad50e97af16ff27a",
lastRev: "",
ok: false,
},
}

for _, testCase := range testCases {
Expand Down