Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Interactive rebase on the same branch is not working #3794

Closed
shuky-shukrun opened this issue Nov 24, 2024 · 7 comments
Closed

Interactive rebase on the same branch is not working #3794

shuky-shukrun opened this issue Nov 24, 2024 · 7 comments
Assignees
Labels
bug Something isn't working verified ✔ Verified

Comments

@shuky-shukrun
Copy link

shuky-shukrun commented Nov 24, 2024

Description

Hi,

Interactive rebase on the same branch with older commit is not possible (to squash older commits for example).
A Nothing to do message always appears.

I went back to v16.0.2 and it's working. I think the issue started from #3747 fix.

Steps to reproduce:

  1. Checkout any branch
  2. Use Gitlens: Git Rebase... from command pallet
  3. Choose the same branch and older commit
  4. See Nothing to do message

Thanks!

GitLens Version

16.0.3

VS Code Version

Version: 1.95.3 (system setup)
Commit: f1a4fb101478ce6ec82fe9627c43efbf9e98c813
Date: 2024-11-13T14:50:04.152Z
Electron: 32.2.1
ElectronBuildId: 10427718
Chromium: 128.0.6613.186
Node.js: 20.18.0
V8: 12.8.374.38-electron.0
OS: Windows_NT x64 10.0.22631

Git Version

git version 2.46.0.windows.1

Logs, Screenshots, Screen Captures, etc

No response

@shuky-shukrun shuky-shukrun added bug Something isn't working triage Needs to be looked at labels Nov 24, 2024
@axosoft-ramint axosoft-ramint self-assigned this Nov 25, 2024
@axosoft-ramint
Copy link
Contributor

Should be fixed in commit: 77a573b

@axosoft-ramint
Copy link
Contributor

axosoft-ramint commented Nov 25, 2024

Can you please verify this fix in the pre-release edition of GitLens (v2024.11.2511 or later)? Thank you so much!

You can switch to the pre-release edition of GitLens by clicking on the "Switch to Pre-Release version of this extension" from the Extensions view.

image

@axosoft-ramint axosoft-ramint added pending-release Resolved but not yet released to the stable edition needs-verification Request for verification and removed triage Needs to be looked at pending-release Resolved but not yet released to the stable edition labels Nov 25, 2024
@axosoft-ramint
Copy link
Contributor

Update: this fix should now be in the latest release version of the extension as well (16.0.4).

@tdakkota
Copy link

Can confirm that 16.0.4 fixed this issue for me.

@axosoft-ramint axosoft-ramint added verified ✔ Verified and removed needs-verification Request for verification labels Nov 25, 2024
@shuky-shukrun
Copy link
Author

Verified in version 16.0.4. Thank you for very quick response and fix!

@RodrigoMural
Copy link

I arrived here with the same problem. I can confirm it is fixed in 16.0.4. Thanks a lot for the super quick fix! 😄

Copy link

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working verified ✔ Verified
Projects
None yet
Development

No branches or pull requests

4 participants