Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Turn on the line numbers delta is said to show

Țugui Dragoș3ecd23df224a
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb0a577e..12388440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -141,7 +141,7 @@ along a removal is, and says within seconds when its helper isn't answering.
- **Tweaks:** The screenshot folder can no longer be the Trash, and a folder screenshots can't be saved in says why.
- **Terminal:** The Git tab leaves a setting to a file your settings include, so Peel's value never wins over yours.
Keep key passphrases in your keychain no longer stops an ssh installed from elsewhere, such as Homebrew's, which
- doesn't know `UseKeychain`.
+ doesn't know `UseKeychain`, and delta's lines on the Tools tab turn on the line numbers its description promises.
- **History:** Put Back brings a file a Homebrew cask or an installer receipt named back under the name the disk
gives it, registers an app it brings back with macOS, and judges with your exclusions as `peel restore` does. Undo
now stays off, as Put Back already did, while History or the exclusions can't be read.
diff --git a/Packages/PeelCore/Sources/PeelCore/Terminal/TerminalTool.swift b/Packages/PeelCore/Sources/PeelCore/Terminal/TerminalTool.swift
index ae545198..eaebf48c 100644
--- a/Packages/PeelCore/Sources/PeelCore/Terminal/TerminalTool.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Terminal/TerminalTool.swift
@@ -117,6 +117,7 @@ public enum TerminalTool: CaseIterable, Sendable {
"git config --global core.pager delta",
"git config --global interactive.diffFilter 'delta --color-only'",
"git config --global delta.navigate true",
+ "git config --global delta.line-numbers true",
])]
case .gitLFS: [Setup(place: .terminal, lines: ["git lfs install"])]
// macOS's man marks bold text with backspaces, which bat would show as they are, so col -bx removes them first.
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/TerminalToolTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TerminalToolTests.swift
index 752d8016..e96e03f2 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/TerminalToolTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/TerminalToolTests.swift
@@ -56,6 +56,11 @@ struct TerminalToolTests {
}
}
+ @Test func deltaTurnsOnTheLineNumbersItsDescriptionPromises() {
+ let lines = TerminalTool.delta.setup(prefix: Self.prefix).flatMap(\.lines)
+ #expect(lines.contains("git config --global delta.line-numbers true"))
+ }
+
@Test func eachInstallCommandNamesEveryFormulaTheToolNeeds() {
#expect(TerminalTool.fzfTab.installCommand == "brew install fzf fzf-tab")
#expect(TerminalTool.delta.installCommand == "brew install git-delta")
diff --git a/TERMINAL.md b/TERMINAL.md
index 0e6f251e..e5840eb8 100644
--- a/TERMINAL.md
+++ b/TERMINAL.md
@@ -505,6 +505,7 @@ Then run these once in Terminal.
git config --global core.pager delta
git config --global interactive.diffFilter 'delta --color-only'
git config --global delta.navigate true
+git config --global delta.line-numbers true
# Git LFS
git lfs install