Parcourir la source

Fixes #1549 fetch for different upstream branch

main
Nafiur Rahman Khadem il y a 2 ans
committed by Eric Amodio
Parent
révision
9a2ad33ddb
2 fichiers modifiés avec 7 ajouts et 1 suppressions
  1. +1
    -0
      CHANGELOG.md
  2. +6
    -1
      src/env/node/git/git.ts

+ 1
- 0
CHANGELOG.md Voir le fichier

@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Fixed
- Fixes [#1549](https://github.com/gitkraken/vscode-gitlens/issues/1549) - Fetch does not work when local branch name differs from remote branch name
- Fixes [#2292](https://github.com/gitkraken/vscode-gitlens/issues/2292) - Push button in BranchTrackingStatusNode of non-current branch does not trigger "Push force"
- Fixes [#1488](https://github.com/gitkraken/vscode-gitlens/issues/1488) - Open Folder History not working with non-English language pack
- Fixes [#2303](https://github.com/gitkraken/vscode-gitlens/issues/2303) - "Googlesource" gerrit only supports two levels of domain — thanks to [PR #2304](https://github.com/gitkraken/vscode-gitlens/pull/2304) by Matt Buckley ([@Mattadore](https://github.com/Mattadore))

+ 6
- 1
src/env/node/git/git.ts Voir le fichier

@ -757,7 +757,12 @@ export class Git {
throw ex;
}
} else {
params.push(options.remote, options.branch);
params.push(
options.remote,
options.upstream
? `${options.upstream}:refs/remotes/${options.remote}/${options.branch}`
: options.branch,
);
}
} else if (options.remote) {
params.push(options.remote);

Chargement…
Annuler
Enregistrer