Browse Source

Closes #2828 allows following across all branches

main
Eric Amodio 1 year ago
parent
commit
c985a2e70c
3 changed files with 7 additions and 13 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +4
    -11
      package.json
  3. +2
    -2
      src/env/node/git/git.ts

+ 1
- 0
CHANGELOG.md View File

@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Improves performance of inline blame, status bar blame, and hovers especially when working with remotes with connected integrations
- Changes the _File History_ view to follow renames and filters out merge commits by default — closes [#2104](https://github.com/gitkraken/vscode-gitlens/issues/2104) & [#2944](https://github.com/gitkraken/vscode-gitlens/issues/2944)
- Changes the _File History_ view to allow following renames while showing history across all branches (which was a previous limitation of Git) — closes [#2828](https://github.com/gitkraken/vscode-gitlens/issues/2828)
- Changes to use our own implementation of `fetch`, `push`, and `pull` Git operations, rather than delegating to VS Code to avoid limitations especially with GitKraken Workspaces. Please report any issues and you can revert this (for now) by setting `"gitlens.experimental.nativeGit"` to `"false"` in your settings
- Relaxes PR autolink detection for Azure DevOps to use `PR <number>` instead of `Merged PR <number>` &mdash; closes [#2908](https://github.com/gitkraken/vscode-gitlens/issues/2908)
- Changes wording on `Reset Stored OpenAI Key` command to `Reset Stored AI Key` to reflect support for other providers

+ 4
- 11
package.json View File

@ -6557,14 +6557,12 @@
{
"command": "gitlens.views.fileHistory.setRenameFollowingOn",
"title": "Follow Renames",
"category": "GitLens",
"enablement": "!config.gitlens.advanced.fileHistoryShowAllBranches"
"category": "GitLens"
},
{
"command": "gitlens.views.fileHistory.setRenameFollowingOff",
"title": "Don't Follow Renames",
"category": "GitLens",
"enablement": "!config.gitlens.advanced.fileHistoryShowAllBranches"
"category": "GitLens"
},
{
"command": "gitlens.views.fileHistory.setShowAllBranchesOn",
@ -10860,17 +10858,12 @@
},
{
"command": "gitlens.views.fileHistory.setRenameFollowingOn",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && config.gitlens.advanced.fileHistoryShowAllBranches",
"group": "3_gitlens@1"
},
{
"command": "gitlens.views.fileHistory.setRenameFollowingOn",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowAllBranches && !config.gitlens.advanced.fileHistoryFollowsRenames",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryFollowsRenames",
"group": "3_gitlens@1"
},
{
"command": "gitlens.views.fileHistory.setRenameFollowingOff",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowAllBranches && config.gitlens.advanced.fileHistoryFollowsRenames",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && config.gitlens.advanced.fileHistoryFollowsRenames",
"group": "3_gitlens@1"
},
{

+ 2
- 2
src/env/node/git/git.ts View File

@ -1275,8 +1275,8 @@ export class Git {
params.push('--first-parent');
}
// Can't allow rename detection (`--follow`) if `all` or a `startLine` is specified
if (renames && (all || startLine != null)) {
// Can't allow rename detection (`--follow`) if a `startLine` is specified
if (renames && startLine != null) {
renames = false;
}

Loading…
Cancel
Save