-
-
Notifications
You must be signed in to change notification settings - Fork 21
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
Puff breaks when a rebase fails to merge #18
Comments
@mroth Any thoughts on this issue? This looks like an awesome utility and I would be stoked to help address this. |
It looks like what's happening here is whatever state the repository is in in the middle of the failed rebase generates output that scmpuff fails to parse during branch extraction. I'm traveling pretty extensive currently, if someone wants to start on this steps would be:
(If someone is not familiar with Go but wants to get involved, step 1 would be helpful in itself as added info as a comment in this issue!) |
The bug report contains the string the branch is trying to be extracted from: |
I just wanted to chime in and say that I can reproduce this consistently whenever I'm doing a rebase and there's a conflict. As @adamv pointed out it seems scmpuff is choking on this string: I had a look through re := regexp.MustCompile(`^## (?:Initial commit on )?(?:(\S+?)(?:\.{3}|$)|(?:HEAD \(no branch\)))`) This seems to work to the extent that it will either match an actual branch name or this specific string. However, I am by no means a RegEx expert, nor have I ever worked with Go before, so if anyone has a less hard-coded and more robust solution to this problem that would be much preferred. |
When you attempt a rebase, and one of the commits fail to merge, a handful of the commands no longer work. I had to solve this through the VCS support in my IDE.
Here's an example output:
The text was updated successfully, but these errors were encountered: