lint/test/data/github-event/github-event-push-merge-commit.json
Marco Ferrari 928972feeb
fix: adjust previous commit id on merge commits (#5950)
- When a commit is a merge commit, adjust the revision so that it
  selects the correct parent.
- Add relevant tests.
- Extract the logic to initialize a Git repository for tests in a
  dedicated function.

Fix #5941
2024-08-02 10:37:27 +02:00

246 lines
11 KiB
JSON

{
"after": "cc62b30b91677b695d3929d6352e7bb541e5ed8c",
"base_ref": null,
"before": "dc27afaa1f4d1b098cbf7602b82de312d20fa481",
"commits": [
{
"author": {
"email": "lae@lae.is",
"name": "lae",
"username": "lae"
},
"committer": {
"email": "lae@lae.is",
"name": "lae",
"username": "lae"
},
"distinct": false,
"id": "74e0339cc37cf77494b723107bd803f6adfd0d9f",
"message": "add README",
"timestamp": "2024-07-31T06:25:36+09:00",
"tree_id": "807fa49be3c439afd7723e7e3a8fea2103bd7368",
"url": "https://github.com/amplify-security/sl-repro-5941/commit/74e0339cc37cf77494b723107bd803f6adfd0d9f"
},
{
"author": {
"email": "lae@lae.is",
"name": "lae",
"username": "lae"
},
"committer": {
"email": "lae@lae.is",
"name": "lae",
"username": "lae"
},
"distinct": false,
"id": "6a887dce059f8bb8bbe597770fd23f88478d6917",
"message": "update README",
"timestamp": "2024-07-31T06:28:50+09:00",
"tree_id": "d12d6bf3200d2bf95052ed41ad0f0c7c58c91dc2",
"url": "https://github.com/amplify-security/sl-repro-5941/commit/6a887dce059f8bb8bbe597770fd23f88478d6917"
},
{
"author": {
"email": "lae@lae.is",
"name": "lae",
"username": "lae"
},
"committer": {
"email": "lae@lae.is",
"name": "lae",
"username": "lae"
},
"distinct": false,
"id": "03571b8e42247c5451b7d1cca3e2eccedb5bc4d3",
"message": "update README",
"timestamp": "2024-07-31T06:31:01+09:00",
"tree_id": "807fa49be3c439afd7723e7e3a8fea2103bd7368",
"url": "https://github.com/amplify-security/sl-repro-5941/commit/03571b8e42247c5451b7d1cca3e2eccedb5bc4d3"
},
{
"author": {
"email": "lae@users.noreply.github.com",
"name": "lae",
"username": "lae"
},
"committer": {
"email": "noreply@github.com",
"name": "GitHub",
"username": "web-flow"
},
"distinct": true,
"id": "cc62b30b91677b695d3929d6352e7bb541e5ed8c",
"message": "Merge pull request #1 from amplify-security/feature/readme\nadd README",
"timestamp": "2024-07-31T06: 33: 25+09: 00",
"tree_id": "807fa49be3c439afd7723e7e3a8fea2103bd7368",
"url": "https://github.com/amplify-security/sl-repro-5941/commit/cc62b30b91677b695d3929d6352e7bb541e5ed8c"
}
],
"compare": "https://github.com/amplify-security/sl-repro-5941/compare/dc27afaa1f4d...cc62b30b9167",
"created": false,
"deleted": false,
"forced": false,
"head_commit": {
"author": {
"email": "lae@users.noreply.github.com",
"name": "lae",
"username": "lae"
},
"committer": {
"email": "noreply@github.com",
"name": "GitHub",
"username": "web-flow"
},
"distinct": true,
"id": "cc62b30b91677b695d3929d6352e7bb541e5ed8c",
"message": "Merge pull request #1 from amplify-security/feature/readme\nadd README",
"timestamp": "2024-07-31T06: 33: 25+09: 00",
"tree_id": "807fa49be3c439afd7723e7e3a8fea2103bd7368",
"url": "https://github.com/amplify-security/sl-repro-5941/commit/cc62b30b91677b695d3929d6352e7bb541e5ed8c"
},
"organization": {
"avatar_url": "https://avatars.githubusercontent.com/u/105519894?v=4",
"description": "",
"events_url": "https://api.github.com/orgs/amplify-security/events",
"hooks_url": "https://api.github.com/orgs/amplify-security/hooks",
"id": 105519894,
"issues_url": "https://api.github.com/orgs/amplify-security/issues",
"login": "amplify-security",
"members_url": "https://api.github.com/orgs/amplify-security/members{/member}",
"node_id": "O_kgDOBkobFg",
"public_members_url": "https://api.github.com/orgs/amplify-security/public_members{/member}",
"repos_url": "https://api.github.com/orgs/amplify-security/repos",
"url": "https://api.github.com/orgs/amplify-security"
},
"pusher": {
"email": "lae@users.noreply.github.com",
"name": "lae"
},
"ref": "refs/heads/main",
"repository": {
"allow_forking": true,
"archive_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/{archive_format}{/ref}",
"archived": false,
"assignees_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/assignees{/user}",
"blobs_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/git/blobs{/sha}",
"branches_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/branches{/branch}",
"clone_url": "https://github.com/amplify-security/sl-repro-5941.git",
"collaborators_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/collaborators{/collaborator}",
"comments_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/comments{/number}",
"commits_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/commits{/sha}",
"compare_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/compare/{base}...{head}",
"contents_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/contents/{+path}",
"contributors_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/contributors",
"created_at": 1722374504,
"custom_properties": {},
"default_branch": "main",
"deployments_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/deployments",
"description": null,
"disabled": false,
"downloads_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/downloads",
"events_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/events",
"fork": false,
"forks": 0,
"forks_count": 0,
"forks_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/forks",
"full_name": "amplify-security/sl-repro-5941",
"git_commits_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/git/commits{/sha}",
"git_refs_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/git/refs{/sha}",
"git_tags_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/git/tags{/sha}",
"git_url": "git://github.com/amplify-security/sl-repro-5941.git",
"has_discussions": false,
"has_downloads": true,
"has_issues": true,
"has_pages": false,
"has_projects": true,
"has_wiki": true,
"homepage": null,
"hooks_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/hooks",
"html_url": "https://github.com/amplify-security/sl-repro-5941",
"id": 835952240,
"is_template": false,
"issue_comment_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/issues/comments{/number}",
"issue_events_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/issues/events{/number}",
"issues_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/issues{/number}",
"keys_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/keys{/key_id}",
"labels_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/labels{/name}",
"language": null,
"languages_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/languages",
"license": null,
"master_branch": "main",
"merges_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/merges",
"milestones_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/milestones{/number}",
"mirror_url": null,
"name": "sl-repro-5941",
"node_id": "R_kgDOMdOecA",
"notifications_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/notifications{?since,all,participating}",
"open_issues": 0,
"open_issues_count": 0,
"organization": "amplify-security",
"owner": {
"avatar_url": "https://avatars.githubusercontent.com/u/105519894?v=4",
"email": null,
"events_url": "https://api.github.com/users/amplify-security/events{/privacy}",
"followers_url": "https://api.github.com/users/amplify-security/followers",
"following_url": "https://api.github.com/users/amplify-security/following{/other_user}",
"gists_url": "https://api.github.com/users/amplify-security/gists{/gist_id}",
"gravatar_id": "",
"html_url": "https://github.com/amplify-security",
"id": 105519894,
"login": "amplify-security",
"name": "amplify-security",
"node_id": "O_kgDOBkobFg",
"organizations_url": "https://api.github.com/users/amplify-security/orgs",
"received_events_url": "https://api.github.com/users/amplify-security/received_events",
"repos_url": "https://api.github.com/users/amplify-security/repos",
"site_admin": false,
"starred_url": "https://api.github.com/users/amplify-security/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/amplify-security/subscriptions",
"type": "Organization",
"url": "https://api.github.com/users/amplify-security"
},
"private": false,
"pulls_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/pulls{/number}",
"pushed_at": 1722375205,
"releases_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/releases{/id}",
"size": 0,
"ssh_url": "git@github.com:amplify-security/sl-repro-5941.git",
"stargazers": 0,
"stargazers_count": 0,
"stargazers_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/stargazers",
"statuses_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/statuses/{sha}",
"subscribers_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/subscribers",
"subscription_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/subscription",
"svn_url": "https://github.com/amplify-security/sl-repro-5941",
"tags_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/tags",
"teams_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/teams",
"topics": [],
"trees_url": "https://api.github.com/repos/amplify-security/sl-repro-5941/git/trees{/sha}",
"updated_at": "2024-07-30T21:24:53Z",
"url": "https://github.com/amplify-security/sl-repro-5941",
"visibility": "public",
"watchers": 0,
"watchers_count": 0,
"web_commit_signoff_required": false
},
"sender": {
"avatar_url": "https://avatars.githubusercontent.com/u/1318013?v=4",
"events_url": "https://api.github.com/users/lae/events{/privacy}",
"followers_url": "https://api.github.com/users/lae/followers",
"following_url": "https://api.github.com/users/lae/following{/other_user}",
"gists_url": "https://api.github.com/users/lae/gists{/gist_id}",
"gravatar_id": "",
"html_url": "https://github.com/lae",
"id": 1318013,
"login": "lae",
"node_id": "MDQ6VXNlcjEzMTgwMTM=",
"organizations_url": "https://api.github.com/users/lae/orgs",
"received_events_url": "https://api.github.com/users/lae/received_events",
"repos_url": "https://api.github.com/users/lae/repos",
"site_admin": false,
"starred_url": "https://api.github.com/users/lae/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/lae/subscriptions",
"type": "User",
"url": "https://api.github.com/users/lae"
}
}