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

Files appearing in unstaged area post rebasing #68

Open
saphal1998 opened this issue Aug 28, 2020 · 1 comment
Open

Files appearing in unstaged area post rebasing #68

saphal1998 opened this issue Aug 28, 2020 · 1 comment
Assignees
Labels
bug Something isn't working domain: SourceControl importance: 1 - must have Must be implemented for the product to be complete urgency: 1 - soon work type: investigation A task that primarily involves digging into a particular problem

Comments

@saphal1998
Copy link
Collaborator

After a rebase, the files seem to be modified but not committed, i.e. they appear in the staging area. Ideally we would want an empty staging area at the end of the rebase.

@taneliang feel free to add more context here

@saphal1998 saphal1998 added bug Something isn't working resolution: invalid This doesn't seem right urgency: 1 - soon importance: 1 - must have Must be implemented for the product to be complete domain: SourceControl labels Aug 28, 2020
@saphal1998 saphal1998 self-assigned this Aug 28, 2020
@saphal1998 saphal1998 removed the resolution: invalid This doesn't seem right label Aug 30, 2020
@taneliang
Copy link
Owner

Thanks! I stumbled upon nodegit/nodegit#1217 that seems pretty much identical to what we're seeing. Seems like this may be a bug on their side? There's also a workaround there that I didn't really understand but maaay be worth trying.

Anyway, more detailed repro notes:

  1. Clone https://github.com/24r/stack-attack-issue-65-repro/commits/main
  2. Rebase commit named "6" onto "4"

The rebase will succeed, and the resulting commit history matches what we expect. However, git status will show that commit 5's changes are present and staged but not committed.

@taneliang taneliang added the work type: investigation A task that primarily involves digging into a particular problem label Aug 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working domain: SourceControl importance: 1 - must have Must be implemented for the product to be complete urgency: 1 - soon work type: investigation A task that primarily involves digging into a particular problem
Projects
None yet
Development

No branches or pull requests

2 participants