Payload
{
"action": "resolved",
"pull_request": {
"url": "https://api.github.com/repos/darkmatter/nixmac/pulls/310",
"id": 3799987141,
"node_id": "PR_kwDOSB6EzM7ifzPF",
"html_url": "https://github.com/darkmatter/nixmac/pull/310",
"diff_url": "https://github.com/darkmatter/nixmac/pull/310.diff",
"patch_url": "https://github.com/darkmatter/nixmac/pull/310.patch",
"issue_url": "https://api.github.com/repos/darkmatter/nixmac/issues/310",
"number": 310,
"state": "open",
"locked": false,
"title": "refactor: migrate `intent_add_untracked` to git2, setting INTENT_TO_ADD flag without shelling out",
"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
},
"body": "## Summary\n\nPort `intent_add_untracked` from CLI to git2, with comments noting a few minor complexities.\n\n<!-- What does this PR do? Why? -->\n\n## Test Plan\n\nExisting unit tests (of which there were some) passed, also added a couple new tests, and did manual testing with things like \"add a new .nix file to my configuration\" and verify that it passes build check and build.\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 -->",
"created_at": "2026-06-04T02:21:32Z",
"updated_at": "2026-06-04T03:11:30Z",
"closed_at": null,
"merged_at": null,
"merge_commit_sha": "cbe526cf87efbb58f3f8bfeac532c540f86ee83c",
"assignees": [],
"requested_reviewers": [
{
"login": "czxtm",
"id": 1325802,
"node_id": "MDQ6VXNlcjEzMjU4MDI=",
"avatar_url": "https://avatars.githubusercontent.com/u/1325802?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/czxtm",
"html_url": "https://github.com/czxtm",
"followers_url": "https://api.github.com/users/czxtm/followers",
"following_url": "https://api.github.com/users/czxtm/following{/other_user}",
"gists_url": "https://api.github.com/users/czxtm/gists{/gist_id}",
"starred_url": "https://api.github.com/users/czxtm/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/czxtm/subscriptions",
"organizations_url": "https://api.github.com/users/czxtm/orgs",
"repos_url": "https://api.github.com/users/czxtm/repos",
"events_url": "https://api.github.com/users/czxtm/events{/privacy}",
"received_events_url": "https://api.github.com/users/czxtm/received_events",
"type": "User",
"user_view_type": "public",
"site_admin": false
}
],
"requested_teams": [],
"labels": [],
"milestone": null,
"draft": false,
"commits_url": "https://api.github.com/repos/darkmatter/nixmac/pulls/310/commits",
"review_comments_url": "https://api.github.com/repos/darkmatter/nixmac/pulls/310/comments",
"review_comment_url": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments{/number}",
"comments_url": "https://api.github.com/repos/darkmatter/nixmac/issues/310/comments",
"statuses_url": "https://api.github.com/repos/darkmatter/nixmac/statuses/ac97e5c46dbfae5d75c5a191441712db001fe72d",
"head": {
"label": "darkmatter:06-04-scott-port-intent-to-add-to-git2",
"ref": "06-04-scott-port-intent-to-add-to-git2",
"sha": "ac97e5c46dbfae5d75c5a191441712db001fe72d",
"user": {
"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
},
"repo": {
"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-03T12:43:14Z",
"pushed_at": "2026-06-04T02:56: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": 679110,
"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": 84,
"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": 84,
"watchers": 5,
"default_branch": "develop"
}
},
"base": {
"label": "darkmatter:06-03-scott-kill-git-stash",
"ref": "06-03-scott-kill-git-stash",
"sha": "dc8d1d262079e1df3267f1968ddc41c52763a04d",
"user": {
"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
},
"repo": {
"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-03T12:43:14Z",
"pushed_at": "2026-06-04T02:56: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": 679110,
"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": 84,
"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": 84,
"watchers": 5,
"default_branch": "develop"
}
},
"_links": {
"self": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/310"
},
"html": {
"href": "https://github.com/darkmatter/nixmac/pull/310"
},
"issue": {
"href": "https://api.github.com/repos/darkmatter/nixmac/issues/310"
},
"comments": {
"href": "https://api.github.com/repos/darkmatter/nixmac/issues/310/comments"
},
"review_comments": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/310/comments"
},
"review_comment": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments{/number}"
},
"commits": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/310/commits"
},
"statuses": {
"href": "https://api.github.com/repos/darkmatter/nixmac/statuses/ac97e5c46dbfae5d75c5a191441712db001fe72d"
}
},
"author_association": "COLLABORATOR",
"auto_merge": null,
"assignee": null,
"active_lock_reason": null
},
"thread": {
"node_id": "PRRT_kwDOSB6EzM6G8Vyp",
"comments": [
{
"url": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments/3353057600",
"pull_request_review_id": 4424170456,
"id": 3353057600,
"node_id": "PRRC_kwDOSB6EzM7H25lA",
"diff_hunk": "@@ -79,39 +79,74 @@ fn git_command() -> GitCommand {\n \n /// Registers all untracked files as intent-to-add in the git index.\n /// Makes files visible to `git ls-files` (and therefore Nix flakes)\n+///\n+/// Commands:\n+/// - Simulates `git ls-files --others --exclude-standard` with `repo.statuses(...)`.\n+/// - Simulates `git add -N -- <untracked files>` by writing empty-blob index\n+/// entries with `IndexEntryExtendedFlag::INTENT_TO_ADD`.\n pub fn intent_add_untracked(dir: &str) -> Result<()> {\n- let repo_root_dir = repo_root(dir);\n- let output = git_command()\n- .args([\"ls-files\", \"--others\", \"--exclude-standard\"])\n- .current_dir(&repo_root_dir)\n- .output()?;\n-\n- if !output.status.success() {\n- let stderr = String::from_utf8_lossy(&output.stderr);\n- return Err(anyhow::anyhow!(\n- \"failed to run `git ls-files --others --exclude-standard` in `{dir}`: {stderr}\"\n- ));\n- }\n-\n- let untracked = String::from_utf8_lossy(&output.stdout);\n- let files: Vec<&str> = untracked.lines().filter(|l| !l.is_empty()).collect();\n+ let repo = git2::Repository::discover(dir)?;\n \n- if files.is_empty() {\n+ let mut status_opts = git2::StatusOptions::new();\n+ status_opts\n+ .show(git2::StatusShow::Workdir)\n+ .include_untracked(true)\n+ .include_ignored(false)\n+ .recurse_untracked_dirs(true);\n+\n+ let statuses = repo.statuses(Some(&mut status_opts))?;\n+ let untracked_paths = statuses\n+ .iter()\n+ .filter(|entry| entry.status().is_wt_new())\n+ // git2's status path API requires UTF-8. This seems like an ok tradeoff, since\n+ // we really shouldn't be trying to manage repos with non-UTF-8 paths.\n+ .map(|entry| entry.path().map(PathBuf::from))\n+ .collect::<std::result::Result<Vec<_>, _>>()?;\n+",
"path": "apps/native/src-tauri/src/git/exec.rs",
"commit_id": "ac97e5c46dbfae5d75c5a191441712db001fe72d",
"original_commit_id": "ac97e5c46dbfae5d75c5a191441712db001fe72d",
"user": {
"login": "Copilot",
"id": 175728472,
"node_id": "BOT_kgDOCnlnWA",
"avatar_url": "https://avatars.githubusercontent.com/in/946600?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/Copilot",
"html_url": "https://github.com/apps/copilot-pull-request-reviewer",
"followers_url": "https://api.github.com/users/Copilot/followers",
"following_url": "https://api.github.com/users/Copilot/following{/other_user}",
"gists_url": "https://api.github.com/users/Copilot/gists{/gist_id}",
"starred_url": "https://api.github.com/users/Copilot/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/Copilot/subscriptions",
"organizations_url": "https://api.github.com/users/Copilot/orgs",
"repos_url": "https://api.github.com/users/Copilot/repos",
"events_url": "https://api.github.com/users/Copilot/events{/privacy}",
"received_events_url": "https://api.github.com/users/Copilot/received_events",
"type": "Bot",
"user_view_type": "public",
"site_admin": false
},
"body": "`entry.path()` returns an `Option<&str>`, but the code currently maps that `Option` and then tries to `collect::<Result<Vec<_>, _>>()?`, which does not type-check (Iterator<Item=Option<_>> cannot be collected into `Result`). This should explicitly convert the `None` case (non‑UTF‑8 status path) into an `anyhow::Error` so the iterator item type is `Result<PathBuf>`.",
"created_at": "2026-06-04T02:27:35Z",
"updated_at": "2026-06-04T02:27:36Z",
"html_url": "https://github.com/darkmatter/nixmac/pull/310#discussion_r3353057600",
"pull_request_url": "https://api.github.com/repos/darkmatter/nixmac/pulls/310",
"_links": {
"self": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments/3353057600"
},
"html": {
"href": "https://github.com/darkmatter/nixmac/pull/310#discussion_r3353057600"
},
"pull_request": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/310"
}
},
"reactions": {
"url": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments/3353057600/reactions",
"total_count": 0,
"+1": 0,
"-1": 0,
"laugh": 0,
"hooray": 0,
"confused": 0,
"heart": 0,
"rocket": 0,
"eyes": 0
},
"start_line": 98,
"original_start_line": 98,
"start_side": "RIGHT",
"line": 105,
"original_line": 105,
"side": "RIGHT",
"author_association": "CONTRIBUTOR",
"original_position": 56,
"position": 56,
"subject_type": "line"
},
{
"url": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments/3353188039",
"pull_request_review_id": 4424322437,
"id": 3353188039,
"node_id": "PRRC_kwDOSB6EzM7H3ZbH",
"diff_hunk": "@@ -79,39 +79,74 @@ fn git_command() -> GitCommand {\n \n /// Registers all untracked files as intent-to-add in the git index.\n /// Makes files visible to `git ls-files` (and therefore Nix flakes)\n+///\n+/// Commands:\n+/// - Simulates `git ls-files --others --exclude-standard` with `repo.statuses(...)`.\n+/// - Simulates `git add -N -- <untracked files>` by writing empty-blob index\n+/// entries with `IndexEntryExtendedFlag::INTENT_TO_ADD`.\n pub fn intent_add_untracked(dir: &str) -> Result<()> {\n- let repo_root_dir = repo_root(dir);\n- let output = git_command()\n- .args([\"ls-files\", \"--others\", \"--exclude-standard\"])\n- .current_dir(&repo_root_dir)\n- .output()?;\n-\n- if !output.status.success() {\n- let stderr = String::from_utf8_lossy(&output.stderr);\n- return Err(anyhow::anyhow!(\n- \"failed to run `git ls-files --others --exclude-standard` in `{dir}`: {stderr}\"\n- ));\n- }\n-\n- let untracked = String::from_utf8_lossy(&output.stdout);\n- let files: Vec<&str> = untracked.lines().filter(|l| !l.is_empty()).collect();\n+ let repo = git2::Repository::discover(dir)?;\n \n- if files.is_empty() {\n+ let mut status_opts = git2::StatusOptions::new();\n+ status_opts\n+ .show(git2::StatusShow::Workdir)\n+ .include_untracked(true)\n+ .include_ignored(false)\n+ .recurse_untracked_dirs(true);\n+\n+ let statuses = repo.statuses(Some(&mut status_opts))?;\n+ let untracked_paths = statuses\n+ .iter()\n+ .filter(|entry| entry.status().is_wt_new())\n+ // git2's status path API requires UTF-8. This seems like an ok tradeoff, since\n+ // we really shouldn't be trying to manage repos with non-UTF-8 paths.\n+ .map(|entry| entry.path().map(PathBuf::from))\n+ .collect::<std::result::Result<Vec<_>, _>>()?;\n+",
"path": "apps/native/src-tauri/src/git/exec.rs",
"commit_id": "ac97e5c46dbfae5d75c5a191441712db001fe72d",
"original_commit_id": "ac97e5c46dbfae5d75c5a191441712db001fe72d",
"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
},
"body": "This comment is wrong.",
"created_at": "2026-06-04T03:11:30Z",
"updated_at": "2026-06-04T03:11:30Z",
"html_url": "https://github.com/darkmatter/nixmac/pull/310#discussion_r3353188039",
"pull_request_url": "https://api.github.com/repos/darkmatter/nixmac/pulls/310",
"_links": {
"self": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments/3353188039"
},
"html": {
"href": "https://github.com/darkmatter/nixmac/pull/310#discussion_r3353188039"
},
"pull_request": {
"href": "https://api.github.com/repos/darkmatter/nixmac/pulls/310"
}
},
"reactions": {
"url": "https://api.github.com/repos/darkmatter/nixmac/pulls/comments/3353188039/reactions",
"total_count": 0,
"+1": 0,
"-1": 0,
"laugh": 0,
"hooray": 0,
"confused": 0,
"heart": 0,
"rocket": 0,
"eyes": 0
},
"start_line": 98,
"original_start_line": 98,
"start_side": "RIGHT",
"line": 105,
"original_line": 105,
"side": "RIGHT",
"in_reply_to_id": 3353057600,
"author_association": "COLLABORATOR",
"original_position": 56,
"position": 56,
"subject_type": "line"
}
]
},
"updated_at": "2026-06-04T11:11:33+08:00",
"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-03T12:43:14Z",
"pushed_at": "2026-06-04T02:56: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": 679110,
"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": 84,
"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": 84,
"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": "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
},
"installation": {
"id": 131074261,
"node_id": "MDIzOkludGVncmF0aW9uSW5zdGFsbGF0aW9uMTMxMDc0MjYx"
}
}