feat(options): add setting to enable git integration for custom worktrees #2092
Conversation
This file contains 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
…s in custom worktree
…n `find_worktree()`
|
Use the following |
mehalter
approved these changes
Jul 5, 2023
mehalter
pushed a commit
that referenced
this pull request
Jul 5, 2023
* feat(options): add setting to enable git integration for custom worktrees * fix(autocmds): add additional check for AstroGitFile to see if file is in custom worktree * refactor(autocmds): extract `in_worktree()` to custom utility function `find_worktree()` * feat(mappings): allow toggle lazygit to automatically load git worktrees if available * chore(mappings): cleanup redundant toggle lazygit mapping
mehalter
pushed a commit
that referenced
this pull request
Jul 5, 2023
* feat(options): add setting to enable git integration for custom worktrees * fix(autocmds): add additional check for AstroGitFile to see if file is in custom worktree * refactor(autocmds): extract `in_worktree()` to custom utility function `find_worktree()` * feat(mappings): allow toggle lazygit to automatically load git worktrees if available * chore(mappings): cleanup redundant toggle lazygit mapping
|
@Subjective I did a slight cleanup on nightly so just let me know if I accidentally broke anything :) |
|
@Subjective do you think you could also make a PR on the documentation to add a new recipe page regarding git working trees? It could give a slight introduction to them and what they are and then describe in more details how to set them up and use them :) Also for reals, thanks again for this contribution. This is a super great new feature!!! |
mehalter
pushed a commit
that referenced
this pull request
Jul 6, 2023
…ng trees (#2092) * feat(options): add setting to enable git integration for custom worktrees * fix(autocmds): add additional check for AstroGitFile to see if file is in custom worktree * refactor(autocmds): extract `in_worktree()` to custom utility function `find_worktree()` * feat(mappings): allow toggle lazygit to automatically load git worktrees if available * chore(mappings): cleanup redundant toggle lazygit mapping
mehalter
added a commit
that referenced
this pull request
Jul 6, 2023
* fix(utils): load treesitter when making notifications * fix(treesitter): ensure markdown treesitter parser * feat: add `vim.g.git_worktrees` to enable usage of detached git working trees (#2092) * feat(options): add setting to enable git integration for custom worktrees * fix(autocmds): add additional check for AstroGitFile to see if file is in custom worktree * refactor(autocmds): extract `in_worktree()` to custom utility function `find_worktree()` * feat(mappings): allow toggle lazygit to automatically load git worktrees if available * chore(mappings): cleanup redundant toggle lazygit mapping * refactor: clean up implementation of git worktrees * fix(ui): notifications appearing on top in unintended situations (#2093) * fix(ui): notifications appearing on top in unintended situations * fix(ui): increase notification zindex to 175 Co-authored-by: Micah Halter <micah@mehalter.com> --------- Co-authored-by: Micah Halter <micah@mehalter.com> * feat: include tables for all map modes in `mappings` and `lsp.mappings` * chore: use `vim.ui.open` if it's available * fix(utils): set cursor in a better position (#2094) * fix: disable `lua_ls` formatting with Neoconf * fix(lsp): hacky fix for neoconf lazy loading * fix(heirline): improve lualine integration with statusline * refactor: simplify notification formatting implementation * fix(utils): update `is_available` to use the correct lazy API * chore(snapshot): update lazy_snapshot --------- Co-authored-by: Josh <56745535+Subjective@users.noreply.github.com> Co-authored-by: Tiago Muniz de Araujo <tiagomuniz130@gmail.com>
mehalter
pushed a commit
that referenced
this pull request
Jul 6, 2023
…ng trees (#2092) * feat(options): add setting to enable git integration for custom worktrees * fix(autocmds): add additional check for AstroGitFile to see if file is in custom worktree * refactor(autocmds): extract `in_worktree()` to custom utility function `find_worktree()` * feat(mappings): allow toggle lazygit to automatically load git worktrees if available * chore(mappings): cleanup redundant toggle lazygit mapping
MattCassar
pushed a commit
to MattCassar/AstroNvim
that referenced
this pull request
Sep 9, 2023
…ng trees (AstroNvim#2092) * feat(options): add setting to enable git integration for custom worktrees * fix(autocmds): add additional check for AstroGitFile to see if file is in custom worktree * refactor(autocmds): extract `in_worktree()` to custom utility function `find_worktree()` * feat(mappings): allow toggle lazygit to automatically load git worktrees if available * chore(mappings): cleanup redundant toggle lazygit mapping
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Many users (myself included) like tracking their dotfiles in bare git repos which rely on setting a custom worktree to work. Unfortunately, this also means that while editing dotfiles, it's not possible to see git diffs in the gutter or open lazygit in the correct repository as without a
.gitfolder it is difficult to know whether a file is being tracked by a bare repo or not.This PR adds git integration when editing files within custom worktrees, allowing toggleterm and gitsigns gutter highlighting to work as you would expect them to. It also fixes the AstroGitFile event to trigger when a file within a custom worktree is opened, allowing plugins like gitsigns to propely lazy load.
This functionality is opt-in, so those who don't rely on custom worktrees won't notice anything.
To enable it, set the global option git_worktrees to an array-like table, where each entry represents a worktree with entries
toplevelandgitdir. This mirrors a similar configuration option in gitsigns (lewis6991/gitsigns.nvim/pull/600). For example, if you have a bare git repo located at ~/.cfg, you can enable git integration for it by setting the following in the AstroNvim global options table: