Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions github/resource_github_repository_collaborators.go
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,13 @@ func updateUserCollaboratorsAndInvites(ctx context.Context, client *github.Clien
if err != nil {
return nil, err
}
inUser.invitationID = inv.ID
ghInvites = append(ghInvites, inUser)
// AddCollaborator returns 204 No Content (inv == nil) when the invitee
// is an organization member gaining direct access without an
// invitation. In that case there is no invitation ID to record.
if inv != nil {
inUser.invitationID = inv.ID
ghInvites = append(ghInvites, inUser)
}
}

for _, l := range remove {
Expand Down
Loading