Payload
{
"action": "edited",
"changes": {
"body": {
"from": "### Merge activity\n\n* **Jun 5, 1:38 AM UTC**: [Graphite](https://app.graphite.com/github/pr/darkmatter/nixmac/311) rebased this pull request, because this pull request is set to merge when ready.\n* **Jun 5, 3:27 AM UTC**: [Graphite](https://app.graphite.com/github/pr/darkmatter/nixmac/311) rebased this pull request, because this pull request is set to merge when ready.\n* **Jun 5, 5:05 AM UTC**: `czxtm` added this pull request to the [Graphite merge queue](https://app.graphite.com/merges?org=darkmatter&repo=nixmac).\n"
}
},
"issue": {
"url": "https://api.github.com/repos/darkmatter/nixmac/issues/311",
"repository_url": "https://api.github.com/repos/darkmatter/nixmac",
"labels_url": "https://api.github.com/repos/darkmatter/nixmac/issues/311/labels{/name}",
"comments_url": "https://api.github.com/repos/darkmatter/nixmac/issues/311/comments",
"events_url": "https://api.github.com/repos/darkmatter/nixmac/issues/311/events",
"html_url": "https://github.com/darkmatter/nixmac/pull/311",
"id": 4585381821,
"node_id": "PR_kwDOSB6EzM7igUid",
"number": 311,
"title": "refactor: migrate checkout_files_at_commit, restore_all, and restore_from_branch_ref to git2",
"user": {
"login": "scottmcmaster",
"id": 3137688,
"node_id": "MDQ6VXNlcjMxMzc2ODg=",
"avatar_url": "https://avatars.githubusercontent.com/u/3137688?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/scottmcmaster",
"html_url": "https://github.com/scottmcmaster",
"followers_url": "https://api.github.com/users/scottmcmaster/followers",
"following_url": "https://api.github.com/users/scottmcmaster/following{/other_user}",
"gists_url": "https://api.github.com/users/scottmcmaster/gists{/gist_id}",
"starred_url": "https://api.github.com/users/scottmcmaster/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/scottmcmaster/subscriptions",
"organizations_url": "https://api.github.com/users/scottmcmaster/orgs",
"repos_url": "https://api.github.com/users/scottmcmaster/repos",
"events_url": "https://api.github.com/users/scottmcmaster/events{/privacy}",
"received_events_url": "https://api.github.com/users/scottmcmaster/received_events",
"type": "User",
"user_view_type": "public",
"site_admin": false
},
"labels": [],
"state": "open",
"locked": false,
"assignees": [],
"milestone": null,
"comments": 4,
"created_at": "2026-06-04T02:56:58Z",
"updated_at": "2026-06-05T05:05:19Z",
"closed_at": null,
"assignee": null,
"author_association": "COLLABORATOR",
"issue_field_values": [],
"type": null,
"active_lock_reason": null,
"draft": false,
"pull_request": {
"url": "https://api.github.com/repos/darkmatter/nixmac/pulls/311",
"html_url": "https://github.com/darkmatter/nixmac/pull/311",
"diff_url": "https://github.com/darkmatter/nixmac/pull/311.diff",
"patch_url": "https://github.com/darkmatter/nixmac/pull/311.patch",
"merged_at": null
},
"body": "## Summary\n\nPort the following methods to git2:\n\n- `checkout_files_at_commit`\n- `restore_all`\n- `restore_from_branch_ref`\n\nI also verified that these are actually used, which is not something to take for granted. I had delayed taking these on because they rely on behavior of `git clean -fd` which doesn't have a direct analogue in git2, but now we have an implementation in the helper method `remove_untracked`.\n\nI should point out that the previous CLI-based methods had some weird behavior which is _not_ replicated namely to reset the entire repo but only clean under the target dir, which I imagine is an artifact of when we were assuming that the \"config dir\" and the \"repo dir\" were always one and the same. I added tests to pin the new behavior which I think was intended by the API contract and the HEAD reset, namely, cleaning the entire repo when we simulate `-fd`. @czxtm let me know if you have any concerns about this.\n\n<!-- What does this PR do? Why? -->\n\n## Test Plan\n\nRan through several manual tests in addition to verifying that the several existing unit tests still pass, and added a number of new unit tests in the process.\n\n- [ ] No test plan needed\n\n## Docs\n\n- [ ] Docs updated (companion PR in darkmatter/nixmac-web: #\\___)\n- [x] No docs update needed\n\n<!-- codesmith:footer -->\n\n---\n\n<picture><source media=\"(prefers-color-scheme: dark)\" srcset=\"https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg\"><source media=\"(prefers-color-scheme: light)\" srcset=\"https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-light-v2.svg\"><img alt=\"View with Codesmith\" src=\"https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg\"></picture> <picture><source media=\"(prefers-color-scheme: dark)\" srcset=\"https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg\"><source media=\"(prefers-color-scheme: light)\" srcset=\"https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-light.svg\"><img alt=\"Autofix with Codesmith\" src=\"https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg\"></picture>\n<sup>Need help on this PR? Tag `/codesmith` with what you need. Autofix is disabled.</sup>\n\n<!-- codesmith:autofix:disabled -->\n\n<!-- /codesmith:footer -->",
"reactions": {
"url": "https://api.github.com/repos/darkmatter/nixmac/issues/311/reactions",
"total_count": 0,
"+1": 0,
"-1": 0,
"laugh": 0,
"hooray": 0,
"confused": 0,
"heart": 0,
"rocket": 0,
"eyes": 0
},
"timeline_url": "https://api.github.com/repos/darkmatter/nixmac/issues/311/timeline",
"performed_via_github_app": {
"id": 158384,
"client_id": "Iv1.922be7c1ac51d2aa",
"slug": "graphite-app",
"node_id": "A_kwHOA7ErVM4AAmqw",
"owner": {
"login": "withgraphite",
"id": 61942612,
"node_id": "MDEyOk9yZ2FuaXphdGlvbjYxOTQyNjEy",
"avatar_url": "https://avatars.githubusercontent.com/u/61942612?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/withgraphite",
"html_url": "https://github.com/withgraphite",
"followers_url": "https://api.github.com/users/withgraphite/followers",
"following_url": "https://api.github.com/users/withgraphite/following{/other_user}",
"gists_url": "https://api.github.com/users/withgraphite/gists{/gist_id}",
"starred_url": "https://api.github.com/users/withgraphite/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/withgraphite/subscriptions",
"organizations_url": "https://api.github.com/users/withgraphite/orgs",
"repos_url": "https://api.github.com/users/withgraphite/repos",
"events_url": "https://api.github.com/users/withgraphite/events{/privacy}",
"received_events_url": "https://api.github.com/users/withgraphite/received_events",
"type": "Organization",
"user_view_type": "public",
"site_admin": false
},
"name": "Graphite App",
"description": "Graphite is a code review platform on top of GitHub that makes creating & code reviewing stacked diffs intuitive, fast, and delightful.",
"external_url": "https://graphite.dev",
"html_url": "https://github.com/apps/graphite-app",
"created_at": "2021-12-13T17:14:28Z",
"updated_at": "2026-02-02T18:37:14Z",
"permissions": {
"actions": "write",
"administration": "read",
"checks": "write",
"contents": "write",
"deployments": "read",
"emails": "read",
"issues": "write",
"members": "read",
"metadata": "read",
"organization_custom_properties": "read",
"organization_custom_roles": "read",
"pull_requests": "write",
"statuses": "read",
"workflows": "write"
},
"events": [
"branch_protection_configuration",
"branch_protection_rule",
"check_run",
"check_suite",
"deployment",
"deployment_status",
"issue_comment",
"label",
"member",
"membership",
"merge_queue_entry",
"organization",
"pull_request",
"pull_request_review",
"pull_request_review_comment",
"pull_request_review_thread",
"push",
"repository",
"repository_ruleset",
"status",
"team",
"team_add",
"workflow_job",
"workflow_run"
]
},
"state_reason": null
},
"comment": {
"url": "https://api.github.com/repos/darkmatter/nixmac/issues/comments/4627387156",
"html_url": "https://github.com/darkmatter/nixmac/pull/311#issuecomment-4627387156",
"issue_url": "https://api.github.com/repos/darkmatter/nixmac/issues/311",
"id": 4627387156,
"node_id": "IC_kwDOSB6EzM8AAAABE9BTFA",
"user": {
"login": "graphite-app[bot]",
"id": 96075541,
"node_id": "BOT_kgDOBbn_FQ",
"avatar_url": "https://avatars.githubusercontent.com/in/158384?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/graphite-app%5Bbot%5D",
"html_url": "https://github.com/apps/graphite-app",
"followers_url": "https://api.github.com/users/graphite-app%5Bbot%5D/followers",
"following_url": "https://api.github.com/users/graphite-app%5Bbot%5D/following{/other_user}",
"gists_url": "https://api.github.com/users/graphite-app%5Bbot%5D/gists{/gist_id}",
"starred_url": "https://api.github.com/users/graphite-app%5Bbot%5D/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/graphite-app%5Bbot%5D/subscriptions",
"organizations_url": "https://api.github.com/users/graphite-app%5Bbot%5D/orgs",
"repos_url": "https://api.github.com/users/graphite-app%5Bbot%5D/repos",
"events_url": "https://api.github.com/users/graphite-app%5Bbot%5D/events{/privacy}",
"received_events_url": "https://api.github.com/users/graphite-app%5Bbot%5D/received_events",
"type": "Bot",
"user_view_type": "public",
"site_admin": false
},
"created_at": "2026-06-05T01:38:19Z",
"updated_at": "2026-06-05T05:06:00Z",
"body": "### Merge activity\n\n* **Jun 5, 1:38 AM UTC**: [Graphite](https://app.graphite.com/github/pr/darkmatter/nixmac/311) rebased this pull request, because this pull request is set to merge when ready.\n* **Jun 5, 3:27 AM UTC**: [Graphite](https://app.graphite.com/github/pr/darkmatter/nixmac/311) rebased this pull request, because this pull request is set to merge when ready.\n* **Jun 5, 5:05 AM UTC**: `czxtm` added this pull request to the [Graphite merge queue](https://app.graphite.com/merges?org=darkmatter&repo=nixmac).\n* **Jun 5, 5:06 AM UTC**: CI is running for this pull request on a draft pull request ([#323](https://app.graphite.com/github/pr/darkmatter/nixmac/323)) due to your merge queue CI optimization settings.\n",
"author_association": "NONE",
"reactions": {
"url": "https://api.github.com/repos/darkmatter/nixmac/issues/comments/4627387156/reactions",
"total_count": 0,
"+1": 0,
"-1": 0,
"laugh": 0,
"hooray": 0,
"confused": 0,
"heart": 0,
"rocket": 0,
"eyes": 0
},
"performed_via_github_app": {
"id": 158384,
"client_id": "Iv1.922be7c1ac51d2aa",
"slug": "graphite-app",
"node_id": "A_kwHOA7ErVM4AAmqw",
"owner": {
"login": "withgraphite",
"id": 61942612,
"node_id": "MDEyOk9yZ2FuaXphdGlvbjYxOTQyNjEy",
"avatar_url": "https://avatars.githubusercontent.com/u/61942612?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/withgraphite",
"html_url": "https://github.com/withgraphite",
"followers_url": "https://api.github.com/users/withgraphite/followers",
"following_url": "https://api.github.com/users/withgraphite/following{/other_user}",
"gists_url": "https://api.github.com/users/withgraphite/gists{/gist_id}",
"starred_url": "https://api.github.com/users/withgraphite/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/withgraphite/subscriptions",
"organizations_url": "https://api.github.com/users/withgraphite/orgs",
"repos_url": "https://api.github.com/users/withgraphite/repos",
"events_url": "https://api.github.com/users/withgraphite/events{/privacy}",
"received_events_url": "https://api.github.com/users/withgraphite/received_events",
"type": "Organization",
"user_view_type": "public",
"site_admin": false
},
"name": "Graphite App",
"description": "Graphite is a code review platform on top of GitHub that makes creating & code reviewing stacked diffs intuitive, fast, and delightful.",
"external_url": "https://graphite.dev",
"html_url": "https://github.com/apps/graphite-app",
"created_at": "2021-12-13T17:14:28Z",
"updated_at": "2026-02-02T18:37:14Z",
"permissions": {
"actions": "write",
"administration": "read",
"checks": "write",
"contents": "write",
"deployments": "read",
"emails": "read",
"issues": "write",
"members": "read",
"metadata": "read",
"organization_custom_properties": "read",
"organization_custom_roles": "read",
"pull_requests": "write",
"statuses": "read",
"workflows": "write"
},
"events": [
"branch_protection_configuration",
"branch_protection_rule",
"check_run",
"check_suite",
"deployment",
"deployment_status",
"issue_comment",
"label",
"member",
"membership",
"merge_queue_entry",
"organization",
"pull_request",
"pull_request_review",
"pull_request_review_comment",
"pull_request_review_thread",
"push",
"repository",
"repository_ruleset",
"status",
"team",
"team_add",
"workflow_job",
"workflow_run"
]
}
},
"repository": {
"id": 1209959628,
"node_id": "R_kgDOSB6EzA",
"name": "nixmac",
"full_name": "darkmatter/nixmac",
"private": false,
"owner": {
"login": "darkmatter",
"id": 17834193,
"node_id": "MDEyOk9yZ2FuaXphdGlvbjE3ODM0MTkz",
"avatar_url": "https://avatars.githubusercontent.com/u/17834193?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/darkmatter",
"html_url": "https://github.com/darkmatter",
"followers_url": "https://api.github.com/users/darkmatter/followers",
"following_url": "https://api.github.com/users/darkmatter/following{/other_user}",
"gists_url": "https://api.github.com/users/darkmatter/gists{/gist_id}",
"starred_url": "https://api.github.com/users/darkmatter/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/darkmatter/subscriptions",
"organizations_url": "https://api.github.com/users/darkmatter/orgs",
"repos_url": "https://api.github.com/users/darkmatter/repos",
"events_url": "https://api.github.com/users/darkmatter/events{/privacy}",
"received_events_url": "https://api.github.com/users/darkmatter/received_events",
"type": "Organization",
"user_view_type": "public",
"site_admin": false
},
"html_url": "https://github.com/darkmatter/nixmac",
"description": "Home manager and nix-darwin that understands plain English",
"fork": false,
"url": "https://api.github.com/repos/darkmatter/nixmac",
"forks_url": "https://api.github.com/repos/darkmatter/nixmac/forks",
"keys_url": "https://api.github.com/repos/darkmatter/nixmac/keys{/key_id}",
"collaborators_url": "https://api.github.com/repos/darkmatter/nixmac/collaborators{/collaborator}",
"teams_url": "https://api.github.com/repos/darkmatter/nixmac/teams",
"hooks_url": "https://api.github.com/repos/darkmatter/nixmac/hooks",
"issue_events_url": "https://api.github.com/repos/darkmatter/nixmac/issues/events{/number}",
"events_url": "https://api.github.com/repos/darkmatter/nixmac/events",
"assignees_url": "https://api.github.com/repos/darkmatter/nixmac/assignees{/user}",
"branches_url": "https://api.github.com/repos/darkmatter/nixmac/branches{/branch}",
"tags_url": "https://api.github.com/repos/darkmatter/nixmac/tags",
"blobs_url": "https://api.github.com/repos/darkmatter/nixmac/git/blobs{/sha}",
"git_tags_url": "https://api.github.com/repos/darkmatter/nixmac/git/tags{/sha}",
"git_refs_url": "https://api.github.com/repos/darkmatter/nixmac/git/refs{/sha}",
"trees_url": "https://api.github.com/repos/darkmatter/nixmac/git/trees{/sha}",
"statuses_url": "https://api.github.com/repos/darkmatter/nixmac/statuses/{sha}",
"languages_url": "https://api.github.com/repos/darkmatter/nixmac/languages",
"stargazers_url": "https://api.github.com/repos/darkmatter/nixmac/stargazers",
"contributors_url": "https://api.github.com/repos/darkmatter/nixmac/contributors",
"subscribers_url": "https://api.github.com/repos/darkmatter/nixmac/subscribers",
"subscription_url": "https://api.github.com/repos/darkmatter/nixmac/subscription",
"commits_url": "https://api.github.com/repos/darkmatter/nixmac/commits{/sha}",
"git_commits_url": "https://api.github.com/repos/darkmatter/nixmac/git/commits{/sha}",
"comments_url": "https://api.github.com/repos/darkmatter/nixmac/comments{/number}",
"issue_comment_url": "https://api.github.com/repos/darkmatter/nixmac/issues/comments{/number}",
"contents_url": "https://api.github.com/repos/darkmatter/nixmac/contents/{+path}",
"compare_url": "https://api.github.com/repos/darkmatter/nixmac/compare/{base}...{head}",
"merges_url": "https://api.github.com/repos/darkmatter/nixmac/merges",
"archive_url": "https://api.github.com/repos/darkmatter/nixmac/{archive_format}{/ref}",
"downloads_url": "https://api.github.com/repos/darkmatter/nixmac/downloads",
"issues_url": "https://api.github.com/repos/darkmatter/nixmac/issues{/number}",
"pulls_url": "https://api.github.com/repos/darkmatter/nixmac/pulls{/number}",
"milestones_url": "https://api.github.com/repos/darkmatter/nixmac/milestones{/number}",
"notifications_url": "https://api.github.com/repos/darkmatter/nixmac/notifications{?since,all,participating}",
"labels_url": "https://api.github.com/repos/darkmatter/nixmac/labels{/name}",
"releases_url": "https://api.github.com/repos/darkmatter/nixmac/releases{/id}",
"deployments_url": "https://api.github.com/repos/darkmatter/nixmac/deployments",
"created_at": "2026-04-14T00:37:13Z",
"updated_at": "2026-06-05T04:20:27Z",
"pushed_at": "2026-06-05T05:05:57Z",
"git_url": "git://github.com/darkmatter/nixmac.git",
"ssh_url": "git@github.com:darkmatter/nixmac.git",
"clone_url": "https://github.com/darkmatter/nixmac.git",
"svn_url": "https://github.com/darkmatter/nixmac",
"homepage": "https://nixmac.com",
"size": 680215,
"stargazers_count": 5,
"watchers_count": 5,
"language": "Rust",
"has_issues": true,
"has_projects": true,
"has_downloads": true,
"has_wiki": true,
"has_pages": false,
"has_discussions": false,
"forks_count": 1,
"mirror_url": null,
"archived": false,
"disabled": false,
"open_issues_count": 76,
"license": {
"key": "mit",
"name": "MIT License",
"spdx_id": "MIT",
"url": "https://api.github.com/licenses/mit",
"node_id": "MDc6TGljZW5zZTEz"
},
"allow_forking": true,
"is_template": false,
"web_commit_signoff_required": false,
"has_pull_requests": true,
"pull_request_creation_policy": "all",
"topics": [
"home-manager",
"nix",
"nix-darwin",
"nix-flake",
"opencode"
],
"visibility": "public",
"forks": 1,
"open_issues": 76,
"watchers": 5,
"default_branch": "develop",
"custom_properties": {}
},
"organization": {
"login": "darkmatter",
"id": 17834193,
"node_id": "MDEyOk9yZ2FuaXphdGlvbjE3ODM0MTkz",
"url": "https://api.github.com/orgs/darkmatter",
"repos_url": "https://api.github.com/orgs/darkmatter/repos",
"events_url": "https://api.github.com/orgs/darkmatter/events",
"hooks_url": "https://api.github.com/orgs/darkmatter/hooks",
"issues_url": "https://api.github.com/orgs/darkmatter/issues",
"members_url": "https://api.github.com/orgs/darkmatter/members{/member}",
"public_members_url": "https://api.github.com/orgs/darkmatter/public_members{/member}",
"avatar_url": "https://avatars.githubusercontent.com/u/17834193?v=4",
"description": ""
},
"enterprise": {
"id": 469843,
"slug": "darkmatter",
"name": "darkmatter",
"node_id": "E_kgDOAAcrUw",
"avatar_url": "https://avatars.githubusercontent.com/b/469843?v=4",
"description": "",
"website_url": "darkmatter.io",
"html_url": "https://github.com/enterprises/darkmatter",
"created_at": "2025-09-07T16:01:00Z",
"updated_at": "2026-05-09T15:34:55Z"
},
"sender": {
"login": "graphite-app[bot]",
"id": 96075541,
"node_id": "BOT_kgDOBbn_FQ",
"avatar_url": "https://avatars.githubusercontent.com/in/158384?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/graphite-app%5Bbot%5D",
"html_url": "https://github.com/apps/graphite-app",
"followers_url": "https://api.github.com/users/graphite-app%5Bbot%5D/followers",
"following_url": "https://api.github.com/users/graphite-app%5Bbot%5D/following{/other_user}",
"gists_url": "https://api.github.com/users/graphite-app%5Bbot%5D/gists{/gist_id}",
"starred_url": "https://api.github.com/users/graphite-app%5Bbot%5D/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/graphite-app%5Bbot%5D/subscriptions",
"organizations_url": "https://api.github.com/users/graphite-app%5Bbot%5D/orgs",
"repos_url": "https://api.github.com/users/graphite-app%5Bbot%5D/repos",
"events_url": "https://api.github.com/users/graphite-app%5Bbot%5D/events{/privacy}",
"received_events_url": "https://api.github.com/users/graphite-app%5Bbot%5D/received_events",
"type": "Bot",
"user_view_type": "public",
"site_admin": false
},
"installation": {
"id": 131074261,
"node_id": "MDIzOkludGVncmF0aW9uSW5zdGFsbGF0aW9uMTMxMDc0MjYx"
}
}