gitkraken / vscode-gitlens

Supercharge Git inside VS Code and unlock untapped knowledge within each repository — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more
http://gitkraken.com/gitlens
Other
9.03k stars 1.35k forks source link

Uses correct counts in rebase command condition/messaging #3780

Closed axosoft-ramint closed 1 day ago

axosoft-ramint commented 3 days ago

Fixes #3747

Updates property names to be clearer in rebase command, and uses the correct side of the left-right commit count to:

  1. Determine if the current branch is caught up to the destination
  2. Determine how many commits will be rebased on top of the destination

Repro steps:

  1. Choose a rebase command: "rebase current branch onto branch", "rebase current branch onto tip", or "GitLens: Git Rebase" command palette command.

  2. Before: Quickpick prevents rebase and states that the current branch is already up-to-date with the destination when it is not. After: Quickpick should allow the rebase, and give the correct number of commits that will be rebased on top of the destination.