clan/clan-core
12
46
Fork 112
Code Issues 256 Pull Requests 40 Actions 1 Packages Projects 3 Releases Wiki Activity

clan-cli: use intent-to-add for files under CLAN_NO_COMMIT #7657

Merged
DavHau merged 1 commits from push-yxrlrnqopwyl into main 2026-07-08 09:34:01 +00:00
Conversation 0 Commits 1 Files Changed 2
+41 -7
pinpox commented 2026-06-24 11:11:56 +00:00
Owner
Copy Link
Copy Source

When CLAN_NO_COMMIT is set, register files with git add --intent-to-add instead of fully staging them. The files still join git's tracked set so Nix flakes can see them, but their content is neither staged nor committed.
This is useful if you use jj and during secrets generation when CLAN_NO_COMMIT is set, so that nix sees the files.

Description of the change

Checklist

  • Ensured documentation is up to date
  • Added tests for all bug fixes and features
  • Doesn't affect backwards compatibility - or check the next points
    • Added the breaking change and migration details to docs/release-notes.md
    • !!! Review from another person is required BEFORE merge !!!

New major features

  • Added major features
    • All features are mentioned in docs/release-notes.md
    • All features are tested sufficiently via:
      • eval tests (for NixOS modules and nix functions)
      • python tests for python API and CLI code
      • VM or container tests for new clan services
When CLAN_NO_COMMIT is set, register files with `git add --intent-to-add` instead of fully staging them. The files still join git's tracked set so Nix flakes can see them, but their content is neither staged nor committed. This is useful if you use `jj` and during secrets generation when `CLAN_NO_COMMIT` is set, so that nix sees the files. ## Description of the change <!-- Brief summary of the change if not already clear from the title --> ## Checklist - [ ] Ensured documentation is up to date - [ ] Added tests for all bug fixes and features - [ ] Doesn't affect backwards compatibility - or check the next points - [ ] Added the breaking change and migration details to docs/release-notes.md - !!! Review from another person is required *BEFORE* merge !!! ## New major features - [ ] Added major features - [ ] All features are mentioned in docs/release-notes.md - [ ] All features are tested sufficiently via: - [ ] eval tests (for NixOS modules and nix functions) - [ ] python tests for python API and CLI code - [ ] VM or container tests for new clan services
👍 1
pinpox added 1 commit 2026-06-24 11:11:56 +00:00
clan-cli: use intent-to-add for files under CLAN_NO_COMMIT
PR Size Review Check / pr-size-review-gate (pull_request) Successful in 33s
Details
sizelint on each commit / sizelint (pull_request) Successful in 36s
Details
label-pr / external (pull_request_target) Successful in 23s
Details
buildbot/nix-eval Build done.
Details
buildbot/nix-build Build done.
Details
gitea-mq/buildbot/nix-eval Build done.
Details
gitea-mq/buildbot/nix-build Build done.
Details
gitea-mq Merge queue passed
Details
cf7d904390 
When CLAN_NO_COMMIT is set, register files with `git add --intent-to-add` instead of fully staging them. The files still join git's tracked set so Nix flakes can see them, but their content is neither staged nor committed.
CODEOWNERS rules requested review from lassulus 2026-06-24 11:11:56 +00:00
CODEOWNERS rules requested review from Mic92 2026-06-24 11:11:56 +00:00
CODEOWNERS rules requested review from kenji 2026-06-24 11:11:56 +00:00
DavHau scheduled this pull request to auto merge when all checks succeed 2026-07-08 09:23:13 +00:00
DavHau merged commit 5963c8934a into main 2026-07-08 09:34:01 +00:00
DavHau deleted branch push-yxrlrnqopwyl 2026-07-08 09:34:01 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
lassulus
Mic92
kenji
Labels
Clear labels
Architecture
Change
Fundamental change spanning across components
Component
API
Issues regarding the clan api
Component
App
Issues regarding the clan app
Component
Backup
Component
CICD
Component
Clan module system
Issues regarding the clan module system including inventory.
Component
Clan Services
Component
CLI
Component
Docs
Component
Flake
Component
Install & Update
Component
Networking
Component
Select
Issues regarding select - the caching layer
Component
Templates
Issues regarding templates.
Component
Testing
Issues regarding testing
Component
VARS
Issues regarding vars.
Component
Virtualisation
Issues regarding virtual machines.
Type/Regression
Breaking change in behavior
Good first issue
Help wanted
OS
Darwin
OS
Linux
Priority
Critical
1
Priority
High
2
Priority
Low
4
Priority
Medium
3
Status
Available
Status
Blocked
1
Status
Duplicate
Status
In Progress
5
Status
Needs More Info
3
Status
Needs Review
4
Status
On Hold
2
Status
Won't Fix
6
Type
Bug
2
Type
Community Contribution
1
contributed by members of the Clan community
Type
Discussion
1
Type
Documentation
Type
Enhancement
6
Type
Epic
4
Type
Feature Request
5
Type
Maintenance
7
Type
Question
Question to be resolved
Type
Question
3
Type
User Experience
5
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
admin brianmcgee clan-bot DavHau Enzime (Michael Hoang) hgl (Glen Huang) hsjobeki kenji (Kenji Berthold) lassulus Mic92 pinpox Qubasa (Luis Hebendanz) renovate
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: clan/clan-core#7657
Delete Branch "push-yxrlrnqopwyl"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?