gitstatus: patch fewer lines #76744
Merged
gitstatus: patch fewer lines #76744
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
The sed invocation was changing all lines matching "local daemon.*". This changed the line it was supposed to, but two other lines that also matched that pattern were being modified, which meant that the "daemon_pid_var" and "daemon_pid" variables were not defined when they should have been.
|
@GrahamcOfBorg build gitstatus |
10 tasks
ryneeverett
added a commit
to ryneeverett/nixpkgs
that referenced
this pull request
Jan 12, 2020
This is a followup to NixOS#76744. The patch is still too aggressive because it captures additional local variables declared in the same line. It should stop when it hits whitespace. See romkatv/gitstatus#92.
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Mar 12, 2020
This is a followup to NixOS#76744. The patch is still too aggressive because it captures additional local variables declared in the same line. It should stop when it hits whitespace. See romkatv/gitstatus#92. (cherry picked from commit be4efc8)
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.
Motivation for this change
The sed invocation was changing all lines matching
local daemon.*. This changed the line it was supposed to, but two other lines that also matched that pattern were being modified, which meant that the "daemon_pid_var" and "daemon_pid" variables were not defined when they should have been. As a result, the gitstatus.plugin.zsh script did not work properly.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @mmlb