Allow scmpuff_status to handle detached git states #24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When rebasing a branch and stopping to resolve a conflict, or when looking at a particular commit, git will be in a detached head state with `git status -bz` returning something along the lines of > ## HEAD (no branch)UU file_with_conflicts.txt This fixes the function that parses this output internally for scmpuff_status to not bail out loudly, but rather pass the `HEAD (no branch)` state up.
houndci-bot
reviewed
Jan 22, 2017
| @@ -28,6 +28,12 @@ | |||
| } | |||
| end | |||
|
|
|||
| Given(/^I switch to existing git branch "([^"]*)"$/) do |branch_name| | |||
| steps %Q{ | |||
There was a problem hiding this comment.
Use % instead of %Q.
%Q-literals should be delimited by ( and ).
Use %Q only for strings that contain both single quotes and double quotes, or for dynamic strings that contain double quotes.
As reported by Hound-CI: - Use % instead of %Q. - %Q-literals should be delimited by ( and ). - Use %Q only for strings that contain both single quotes and double quotes, or for dynamic strings that contain double quotes.
|
This looks great @bikezilla, thanks for putting in the tests! My plan is to merge this and cut and new binary release once Go 1.8 comes out in a week or two (so that the binaries are built with the new version, since I don't release them that often). Leaving this open for now only so I don't forget to do the binary release quite so easily (feel free to poke me if I haven't gotten to it within a week of the 1.8 release). |
|
Merging in preparation for a new release. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When rebasing a branch and stopping to resolve a conflict, or when
looking at a particular commit, git will be in a detached head state
with
git status -bzreturning something along the lines of## HEAD (no branch)UU file_with_conflicts.txtThis fixes the function that parses this output internally for
scmpuff_status to not bail out loudly, but rather pass the
HEAD (no branch)state up.Fixes #18