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

Jump to bottom

gitstatus: patch fewer characters #77580

Merged
merged 2 commits into from Jan 13, 2020
Merged

gitstatus: patch fewer characters #77580

merged 2 commits into from Jan 13, 2020

Conversation

ryneeverett
Copy link
Contributor

@ryneeverett ryneeverett commented Jan 12, 2020 •
edited

This is a followup to #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.

Even better, patching in the GITSTATUS_DAEMON variable seems like a more stable
solution than doing inline replacements.

See romkatv/gitstatus#92.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mmlb

@ryneeverett
gitstatus: patch fewer characters
be4efc8 
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.
@ryneeverett ryneeverett force-pushed the gitstatus-patch-even-fewer-lines branch from d98eeac to be4efc8 Compare January 12, 2020 22:02
@ryneeverett ryneeverett changed the title gitstatus: patch even fewer lines gitstatus: patch fewer characters Jan 12, 2020
@ryneeverett
gitstatus: patch in variable rather than regexing
f5e446b 
Patching in the GITSTATUS_DAEMON variable seems like a more stable
solution than doing inline replacements.
@ryneeverett ryneeverett mentioned this pull request Jan 12, 2020
Merged
@bdesham
Copy link
Contributor

bdesham commented Jan 13, 2020

Works for me! Thank you for fixing this.

@infinisil
Copy link
Member

Looking at gitstatus' source code is seems to also have a non-zsh version of this which could be installed as well in the future

@infinisil infinisil merged commit 8bc64e2 into NixOS:master Jan 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ryneeverett @bdesham @infinisil