Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 55bba8e4f517
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4331eeb13d24
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 9, 2019

  1. Filter ANSI escape sequences in -L output 

    Otherwise, builds like NixOS VM tests may leave the terminal in a
weird state and do resets.
    @edolstra
    edolstra committed Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4331eeb View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/nix/progress-bar.cc
2 changes: 1 addition & 1 deletion src/nix/progress-bar.cc
View file
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ class ProgressBar : public Logger
void log(State & state, Verbosity lvl, const std::string & s)
{
if (state.active) {
writeToStderr("\r\e[K" + s + ANSI_NORMAL "\n");
writeToStderr("\r\e[K" + filterANSIEscapes(s, !isTTY) + ANSI_NORMAL "\n");
draw(state);
} else {
auto s2 = s + ANSI_NORMAL "\n";