From 9378b12d26ae68323ac30883b53d41d45ceaaaf9 Mon Sep 17 00:00:00 2001 From: Alice Carroll Date: Mon, 30 Oct 2023 00:01:51 +0300 Subject: [PATCH] Re-export `COLORTERM` only locally in `brew edit` --- Library/Homebrew/dev-cmd/edit.rb | 2 ++ bin/brew | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/edit.rb b/Library/Homebrew/dev-cmd/edit.rb index 618ce68cca..b8c5f4bf6a 100644 --- a/Library/Homebrew/dev-cmd/edit.rb +++ b/Library/Homebrew/dev-cmd/edit.rb @@ -85,6 +85,8 @@ module Homebrew def edit args = edit_args.parse + ENV["COLORTERM"] = ENV.fetch("HOMEBREW_COLORTERM", nil) + unless (HOMEBREW_REPOSITORY/".git").directory? odie <<~EOS Changes will be lost! diff --git a/bin/brew b/bin/brew index ccbac9dccd..7ddb2712c6 100755 --- a/bin/brew +++ b/bin/brew @@ -152,6 +152,7 @@ done # We don't want to take the user's value for, e.g., `HOMEBREW_PATH` here! USED_BY_HOMEBREW_VARS=( CODESPACES + COLORTERM DBUS_SESSION_BUS_ADDRESS PATH SSH_TTY @@ -204,7 +205,7 @@ PATH="/usr/bin:/bin:/usr/sbin:/sbin" FILTERED_ENV=() ENV_VAR_NAMES=( - HOME SHELL PATH TERM TERMINFO TERMINFO_DIRS COLORTERM COLORFGBG COMMAND_MODE COLUMNS DISPLAY LOGNAME USER CI SSH_AUTH_SOCK SUDO_ASKPASS + HOME SHELL PATH TERM TERMINFO TERMINFO_DIRS COLUMNS DISPLAY LOGNAME USER CI SSH_AUTH_SOCK SUDO_ASKPASS http_proxy https_proxy ftp_proxy no_proxy all_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY ) # Filter all but the specific variables.