Compatibility with OSX #1
Open
Conversation
This file contains hidden or 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
…), using -E (egrep format) instead
|
No problem! I'll test it out quickly on my machine and merge in a bit. Thanks for the PR. |
|
Turns out that it returns very different results when using this change; will have a quick look. |
| @@ -4,7 +4,7 @@ branch_limit = 10 if branch_limit == 0 | |||
|
|
|||
| show_current_branch = (`git config --get recent.showcurrent 2>/dev/null`.to_i == 1) ? true : false | |||
| current_branch = `git rev-parse --abbrev-ref HEAD 2>/dev/null`.chomp | |||
| all_branches = `git reflog 2>/dev/null | \\grep -Pio "moving from ([^\\s]+)" | \\awk '{ print $3 }' | \\grep -Piv "[0-9a-f]{40}"`.split("\n") | |||
| all_branches = `git reflog 2>/dev/null | \\grep -Eio "moving from ([^\\s]+)$" | \\awk '{ print $3 }' | \\grep -Eiv "[0-9a-f]{40}"`.split("\n") | |||
There was a problem hiding this comment.
I think the ([^\\s]+)$ here needs to change to ([^[:space:]]+) - at least that makes it work as it did before.
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.
Hi,
Thanks for writing this tool and making it public, saved me shaving one more yak!
Just a small tweak, since on the version of grep I have on osx (might be via homebrew) the -P option is not available. My research indicates that -E should be available on most versions of grep - if not, or if I've missed an edge case, please reject the request as I'd rather not mess up this very useful script for others.
Thanks again,
Matthew