7cc5c4f330d47060/tiktok-sparo
1
0
Fork 0
mirror of https://github.com/tiktok/sparo.git synced 2025-03-25 20:29:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from tiktok/feat-fetch-behavior

Browse source 
"sparo fetch" behaves the same as "git fetch" when no remote or no branches specified
This commit is contained in:
Cheng Liu 2024-07-11 15:45:10 -07:00 • committed by GitHub
commit 3c916a2614
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 4 deletions
apps/sparo-lib/src/cli/commands
fetch.ts
common/changes/sparo
feat-fetch-behavior_2024-07-11-22-08.json

20
apps/sparo-lib/src/cli/commands/fetch.ts
View file

@ -41,13 +41,19 @@ export class FetchCommand implements ICommand<IFetchCommandOptions> {
const { _gitService: gitService } = this;
const { terminal } = terminalService;
const repoInfo: GitRepoInfo = gitService.getRepoInfo();
const { branch: defaultBranch } = repoInfo;
const { branch: currentBranch } = repoInfo;
terminal.writeDebugLine(`got args in fetch command: ${JSON.stringify(args)}`);
const { all, branch = defaultBranch, remote = this._gitService.getBranchRemote(branch) } = args;
const { all, branch } = args;
let { remote } = args;
const fetchArgs: string[] = ['fetch'];
await this._gitRemoteFetchConfigService.pruneRemoteBranchesInGitConfigAsync(remote || 'origin');
// When no remote is specified, by default the origin remote will be used,
// unless there’s an upstream branch configured for the current branch.
remote = this._gitService.getBranchRemote(currentBranch) || 'origin';
this._gitRemoteFetchConfigService.addRemoteBranchIfNotExists(remote, currentBranch);
await this._gitRemoteFetchConfigService.pruneRemoteBranchesInGitConfigAsync(remote);
let restoreSingleBranchCallback: (() => void) | undefined;
if (all) {
@ -56,7 +62,13 @@ export class FetchCommand implements ICommand<IFetchCommandOptions> {
fetchArgs.push('--all');
} else {
fetchArgs.push(remote, branch);
fetchArgs.push(remote);
if (branch) {
fetchArgs.push(branch);
} else {
// When no <refspec>s appear on the command line, the refs to fetch are read from remote.<repository>.fetch
// variables instead
}
}
gitService.executeGitCommand({ args: fetchArgs });

10
common/changes/sparo/feat-fetch-behavior_2024-07-11-22-08.json Normal file
View file

@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "sparo",
"comment": "\"sparo fetch\" behaves the same as \"git fetch\" when no remote or no branches specified",
"type": "none"
}
],
"packageName": "sparo"
}