Browse Source

Fixes #1549 fetch for different upstream branch

main
Nafiur Rahman Khadem 2 years ago
committed by Eric Amodio
parent
commit
9a2ad33ddb
2 changed files with 7 additions and 1 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +6
    -1
      src/env/node/git/git.ts

+ 1
- 0
CHANGELOG.md View File

@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Fixed ### 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 [#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 [#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)) - 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 View File

@ -757,7 +757,12 @@ export class Git {
throw ex; throw ex;
} }
} else { } 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) { } else if (options.remote) {
params.push(options.remote); params.push(options.remote);

Loading…
Cancel
Save