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

gps ls not working after update #298

Open
rgrinberg opened this issue Mar 13, 2024 · 4 comments
Open

gps ls not working after update #298

rgrinberg opened this issue Mar 13, 2024 · 4 comments
Assignees

Comments

@rgrinberg
Copy link

I'm now getting the following error:

RUST_BACKTRACE=1 gps ls
thread 'main' panicked at src/ps/public/list.rs:314:14:
called `Result::unwrap()` on an `Err` value: GetListLocalBranchesWithInfoFailed(GetListBranchInfoFailed(GetPatchInfoCollectionFailed(GetCommonAncestor(MergeBase(Error { code: -3, klass: 22, message: "no merge base found" })))))
stack backtrace:
   0: _rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::result::unwrap_failed
   3: core::result::Result<T,E>::unwrap
   4: gps::ps::public::list::list
   5: gps::commands::list::list
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
@drewdeponte
Copy link
Owner

@rgrinberg what do you mean now? Did you just upgrade? If so what version were you running before and what version are you running now?

@drewdeponte
Copy link
Owner

@rgrinberg That error is telling us that during the state computation it failed to find a merge base (aka a common ancestor). I will have to go review that code and see if anything jumps out at me related to this. It definitely shouldn't be failing out. Because any state that you can properly have with Git proper should work with Git Patch Stack.

@rgrinberg
Copy link
Author

Yes, I updated to a new version recently. I think I was using 6.9

@drewdeponte drewdeponte self-assigned this Mar 15, 2024
@drewdeponte drewdeponte moved this from Triage to Accepted in git-ps-rs Mar 15, 2024
@drewdeponte
Copy link
Owner

@rgrinberg I started looking into the code around this. Do you happen to have an orphan branch (a branch that has its own parentless root) in addition to main/master?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants