feat(git): migrate diff pager to delta and fix worktree-aware branch cleanup#5
Merged
Merged
Conversation
…ee-aware - Replace diff-so-fancy with git-delta as core pager; delta passes non-diff output through, so git branch no longer breaks under the pager - Add delta config (navigate, line-numbers) and interactive diffFilter - Fix git-clean: skip worktree (+) and current (*) markers when parsing git branch -vv, so it no longer runs git branch -D + - Fix bam alias the same way (exclude ^[+*]) - Swap diff-so-fancy -> git-delta in Brewfile and pacman.txt; update TOOLS.md
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
What
Fixes three issues reported on Hades (TASK-040):
git df/git brfailing —diff-so-fancywas set ascore.pager, so it also filteredgit branchoutput, which it can't parse. Migrated the pager to git-delta (passes non-diff through cleanly), and addedinteractive.diffFilter+ a[delta]block (navigate, line-numbers).git-clean/bamtrying to delete branch'+'— git marks worktree-checked-out branches with a leading+(like*for current). Both helpers parsedgit branchoutput without skipping that marker, so+reachedgit branch -D. Both now exclude^[+*].Manifests + docs — swapped
diff-so-fancy→git-deltainpackages/Brewfile,packages/pacman.txt, andTOOLS.md.Notes
git-deltais in Archextra(pacman -S git-delta) and Homebrew (brew install git-delta) — no AUR needed.git -C ~/.dotfiles pullmakes it live (symlinks already point at the repo).zsh -npasses on.functions, awk fix tested (skips+/*markers).