ignore .worktrees as a "special folder" #35835
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
following the approach from nixpkgs that ignore the .worktrees folder, we could also do the same, this would allow worktrees to be worked on in the same folder as the primary branch. ref: NixOS/nixpkgs@b6420c7
techknowlogick
added
the
skip-changelog
GiteaBot
added
the
lgtm/need 2
|
Is it |
|
@silverwind I added the s to make it plural, so it doesn't exactly follow their naming, but it follows the approach of having some folder in the repo root that contains all worktrees. |
silverwind
approved these changes
Nov 3, 2025
GiteaBot
added
lgtm/need 1
lunny
approved these changes
Nov 3, 2025
GiteaBot
added
lgtm/done
@silverwind I find them helpful as they lessen the copies of the .git directory I have when working on multiple branches simultaneously (basically having multiple folders share the same .git folder objects so they don't need to be duplicated. So say I could do a git fetch origin, and then each "copy" would then have access to all of the new objects so I could then git merge origin/main to keep things up to date). |
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Nov 6, 2025
* giteaofficial/main: Remove padding override on `.ui .sha.label` (go-gitea#35864) fix(api/repo/contents): set the dates to now when not specified by the caller (go-gitea#35861) Remove `fix` Make targets (go-gitea#35868) Refactor ls-tree and git path related problems (go-gitea#35858) Fix pull description code label background (go-gitea#35865) Make ACME email optional (go-gitea#35849) Remove wrong code (go-gitea#35846) Fix Arch repo pacman.conf snippet (go-gitea#35825) Port away from `flake-utils` (go-gitea#35675) Update golangci-lint to v2.6.0 (go-gitea#35801) Add a doctor command to fix inconsistent run status (go-gitea#35840) Fix viewed files number is not right if not all files loaded (go-gitea#35821) Fix incorrect pull request counter (go-gitea#35819) Fix a number of `strictNullChecks`-related issues (go-gitea#35795) ignore .worktrees as a "special folder" (go-gitea#35835) upgrade go mail to 0.7.2 and fix the bug (go-gitea#35833)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
following the approach from nixpkgs that ignore the .worktrees folder, we could also do the same, this would allow worktrees to be worked on in the same folder as the primary branch.
ref: NixOS/nixpkgs@b6420c7