Default branch setting uses the users global git config instead of CodeEdit settings.

Author: austincondiff

CodeEdit/Features/Settings/Pages/SourceControlSettings/Models/SourceControlSettings.swift

@@ -71,8 +71,6 @@ extension SettingsData {
         var revisionComparisonLayout: RevisionComparisonLayout = .localLeft
         /// The selected value of the control navigator
         var controlNavigatorOrder: ControlNavigatorOrder = .sortByName
-        /// The name of the default branch
-        var defaultBranchName: String = "main"
         /// Default initializer
         init() {}
         /// Explicit decoder init for setting default values when key is not present in `JSON`
@@ -109,7 +107,6 @@ extension SettingsData {
                 ControlNavigatorOrder.self,
                 forKey: .controlNavigatorOrder
             ) ?? .sortByName
-            self.defaultBranchName = try container.decodeIfPresent(String.self, forKey: .defaultBranchName) ?? "main"
         }
     }
 

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift

@@ -11,7 +11,10 @@ struct SourceControlGeneralView: View {
     @AppSettings(\.sourceControl.general)
     var settings
 
-    @State private var text: String = "main"
+    let gitConfig = GitConfigClient(shellClient: currentWorld.shellClient)
+
+    @State private var defaultBranch: String = ""
+    @State private var hasAppeared = false
 
     var body: some View {
         SettingsForm {
@@ -32,6 +35,14 @@ struct SourceControlGeneralView: View {
                 defaultBranchName
             }
         }
+        .onAppear {
+            Task {
+                defaultBranch = try await gitConfig.get(key: "init.defaultBranch", global: true) ?? ""
+                Task {
+                    hasAppeared = true
+                }
+            }
+        }
     }
 }
 
@@ -116,9 +127,18 @@ private extension SourceControlGeneralView {
     }
 
     private var defaultBranchName: some View {
-        TextField(text: $text) {
+        TextField(text: $defaultBranch) {
             Text("Default branch name")
             Text("Cannot contain spaces, backslashes, or other symbols")
         }
+        .onChange(of: defaultBranch) { newValue in
+            if hasAppeared {
+                Limiter.debounce(id: "defaultBranchDebouncer", duration: 0.5) {
+                    Task {
+                        await gitConfig.set(key: "init.defaultBranch", value: newValue, global: true)
+                    }
+                }
+            }
+        }
     }
 }

CodeEdit/Features/SourceControl/Views/SourceControlPullView.swift

@@ -13,10 +13,11 @@ struct SourceControlPullView: View {
 
     @EnvironmentObject var sourceControlManager: SourceControlManager
 
+    let gitConfig = GitConfigClient(shellClient: currentWorld.shellClient)
+
     @State var loading: Bool = false
 
-    @AppSettings(\.sourceControl.git.preferRebaseWhenPulling)
-    var preferRebaseWhenPulling
+    @State var preferRebaseWhenPulling: Bool = false
 
     var body: some View {
         VStack(spacing: 0) {
@@ -39,8 +40,11 @@ struct SourceControlPullView: View {
             .scrollDisabled(true)
             .scrollContentBackground(.hidden)
             .onAppear {
-                if preferRebaseWhenPulling {
-                    sourceControlManager.operationRebase = true
+                Task {
+                    preferRebaseWhenPulling = try await gitConfig.get(key: "pull.rebase", global: true) ?? false
+                    if preferRebaseWhenPulling {
+                        sourceControlManager.operationRebase = true
+                    }
                 }
             }
             HStack {