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.

Forget a refusal on the Git tab when the page goes away

Țugui Dragoș54b2d153fa83
diff --git a/Peel/Model/GitLibrary.swift b/Peel/Model/GitLibrary.swift
index faf120e0..41bf2ac6 100644
--- a/Peel/Model/GitLibrary.swift
+++ b/Peel/Model/GitLibrary.swift
@@ -97,6 +97,10 @@ final class GitLibrary {
}
}
+ func forgetRefusal() {
+ wasRefused = false
+ }
+
private func save(_ ledger: GitLedger) {
defaults.set(ledger.stored, forKey: Self.ledgerKey)
}
diff --git a/Peel/Views/Terminal/TerminalPage.swift b/Peel/Views/Terminal/TerminalPage.swift
index a7f54a25..243b4c30 100644
--- a/Peel/Views/Terminal/TerminalPage.swift
+++ b/Peel/Views/Terminal/TerminalPage.swift
@@ -52,6 +52,7 @@ struct TerminalPage: View {
terminal.forgetRefusal()
shell.forgetRefusal()
ssh.forgetRefusal()
+ git.forgetRefusal()
}
.onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in
Task { await refresh() }
diff --git a/PeelTests/TerminalLibrariesTests.swift b/PeelTests/TerminalLibrariesTests.swift
index 2f7fcaaf..35247e52 100644
--- a/PeelTests/TerminalLibrariesTests.swift
+++ b/PeelTests/TerminalLibrariesTests.swift
@@ -262,6 +262,25 @@ struct TerminalLibrariesTests {
#expect(library.state?.isInstalled == false)
}
+ @Test func aGitRefusalIsForgottenWhenThePageGoes() async throws {
+ let home = try madeUpHome()
+ defer { try? FileManager.default.removeItem(at: home) }
+ let made = try MadeUpDefaults()
+ defer { made.forget() }
+ let git = home.appending(path: "git")
+ try Data("#!/bin/sh\nexit 1\n".utf8).write(to: git)
+ try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: git.path(percentEncoded: false))
+ let library = GitLibrary(home: home, defaults: made.defaults) { GitConfig(executable: git, home: home) }
+ await library.refresh()
+
+ library.set(.rebaseOnPull, to: true)
+ await library.refresh()
+ #expect(library.wasRefused)
+
+ library.forgetRefusal()
+ #expect(!library.wasRefused)
+ }
+
@Test func aGitChangeSavesTheLedgerInTheStoreItWasGiven() async throws {
let home = try madeUpHome()
defer { try? FileManager.default.removeItem(at: home) }