Merge pull request #90 from tiktok/fix-branch-fetch-config

Fix branch fetch config

apps/sparo-lib/src/cli/commands/checkout.ts

@@ -281,6 +281,9 @@ export class CheckoutCommand implements ICommand<ICheckoutCommandOptions> {
             }
           }
         }
+      } else {
+        const remote: string = this._gitService.getBranchRemote(operationBranch);
+        this._gitRemoteFetchConfigService.addRemoteBranchIfNotExists(remote, operationBranch);
       }
     }
 

apps/sparo-lib/src/services/GitRemoteFetchConfigService.ts

@@ -35,6 +35,11 @@ export class GitRemoteFetchConfigService {
     this._gitService.executeGitCommand({
       args: ['remote', 'set-branches', '--add', remote, branch]
     });
+
+    // Example: branch.feature-foo.remote=origin
+    this._gitService.setGitConfig(`branch.${branch}.remote`, remote);
+    // Example: branch.feature-foo.merge=refs/heads/feature-foo
+    this._gitService.setGitConfig(`branch.${branch}.merge`, `refs/heads/${branch}`);
   }
 
   public pruneRemoteBranchesInGitConfigAsync = async (remote: string): Promise<void> => {
@@ -96,6 +101,12 @@ export class GitRemoteFetchConfigService {
       this._gracefulShutdownService.registerCallback(callback);
       this._setRemoteFetchInGitConfig(remote, Array.from(nextRemoteFetchConfigSet));
       this._gracefulShutdownService.unregisterCallback(callback);
+
+      // Clean up other git configurations
+      for (const invalidBranch of invalidBranches) {
+        this._gitService.unsetGitConfig(`branch.${invalidBranch}.remote`);
+        this._gitService.unsetGitConfig(`branch.${invalidBranch}.merge`);
+      }
     }
   };
 

common/changes/sparo/fix-branch-fetch-config_2024-09-23-22-33.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "sparo",
+      "comment": "Fix git configs for tracking branch",
+      "type": "none"
+    }
+  ],
+  "packageName": "sparo"
+}