Merge branch 'release/0.28.2'

intitni · Dec 4, 2023 · 8613f35 · 8613f35
2 parents b3a73bc + d0e41d2
commit 8613f35
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/Tool/Sources/GitIgnoreCheck/GitIgnoreCheck.swift b/Tool/Sources/GitIgnoreCheck/GitIgnoreCheck.swift
@@ -52,12 +52,13 @@ public struct DefaultGitIgnoredChecker: GitIgnoredChecker {
             return false
         }
         do {
-            _ = try await terminal.runCommand(
+            let result = try await terminal.runCommand(
                 "/bin/bash",
-                arguments: ["-i", "-c", "git check-ignore \"\(fileURL.path)\""],
+                arguments: ["-c", "git check-ignore \"\(fileURL.path)\""],
                 currentDirectoryPath: gitFolderURL.path,
                 environment: [:]
             )
+            if result.isEmpty { return false }
             return true
         } catch {
             return false
@@ -75,7 +76,7 @@ public struct DefaultGitIgnoredChecker: GitIgnoredChecker {
         do {
             let result = try await terminal.runCommand(
                 "/bin/bash",
-                arguments: ["-i", "-c", "git check-ignore \(filePaths)"],
+                arguments: ["-c", "git check-ignore \(filePaths)"],
                 currentDirectoryPath: gitFolderURL.path,
                 environment: [:]
             )

diff --git a/Tool/Sources/Preferences/Keys.swift b/Tool/Sources/Preferences/Keys.swift
@@ -548,7 +548,7 @@ public extension UserDefaultPreferenceKeys {
     }
 
     var disableGitIgnoreCheck: FeatureFlag {
-        .init(defaultValue: true, key: "FeatureFlag-DisableGitIgnoreCheck")
+        .init(defaultValue: false, key: "FeatureFlag-DisableGitIgnoreCheck")
     }
 
     var disableEnhancedWorkspace: FeatureFlag {

diff --git a/Version.xcconfig b/Version.xcconfig
@@ -1,3 +1,3 @@
-APP_VERSION = 0.28.1
-APP_BUILD = 291
+APP_VERSION = 0.28.2
+APP_BUILD = 292
 
diff --git a/appcast.xml b/appcast.xml
@@ -4,15 +4,15 @@
     <title>Copilot for Xcode</title>
 
     <item>
-      <title>0.28.1</title>
-      <pubDate>Mon, 04 Dec 2023 22:36:27 +0800</pubDate>
-      <sparkle:version>291</sparkle:version>
-      <sparkle:shortVersionString>0.28.1</sparkle:shortVersionString>
+      <title>0.28.2</title>
+      <pubDate>Mon, 04 Dec 2023 23:11:26 +0800</pubDate>
+      <sparkle:version>292</sparkle:version>
+      <sparkle:shortVersionString>0.28.2</sparkle:shortVersionString>
       <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
       <sparkle:releaseNotesLink>
-        https://github.com/intitni/CopilotForXcode/releases/tag/0.28.1
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.28.2
       </sparkle:releaseNotesLink>
-      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.28.1/Copilot.for.Xcode.app.zip" length="36956617" type="application/octet-stream" sparkle:edSignature="e2ck6UD02QCZXoAlYuvbfUd+YzXJ6d/+V5FdzKKY0C5+X8QdqoUHaUXFmf1keulF7IJD7GAiOVQ2ewrl/KYVCA=="/>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.28.2/Copilot.for.Xcode.app.zip" length="36956678" type="application/octet-stream" sparkle:edSignature="kiWm6C0aaxs9cvlSgmH3Y5iVIP5R9hbdgZGXC6qQw8mDG2E8Vc9Rq7ZY8Jz09NDL3GrDXZT3BwoY58Jdev5TAg=="/>
     </item>
 
     <item>