From 8460d75869fcddaaa2a6beed9b4d78c60a9fed19 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Tue, 25 Jan 2022 08:23:27 +0000 Subject: 49709: vcs_info hg: Keep $HGPLAIN set for hooks if it had been set outside vcs_info If someone does 'HGPLAIN=1 vcs_info', any vcs_info hooks should be called with HGPLAIN set. Declaring it 'local' broke that. --- ChangeLog | 6 ++++++ Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1bc824b4a..200c28d1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-01-25 Daniel Shahaf + + * 49709: Functions/VCS_Info/Backends/VCS_INFO_get_data_hg: + vcs_info hg: Keep $HGPLAIN set for hooks if it had been set + outside vcs_info + 2022-01-23 Andreas Schneider * gitlab !17: Completion/Unix/Command/_quilt: Add missing diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index 2806aee1d..b123e2270 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -56,7 +56,6 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" \ "check-for-changes" || hgid_args+=( -r. ) - local HGPLAIN HGPLAIN=1 ${vcs_comm[cmd]} ${(z)hgid_args} 2> /dev/null \ | read -r r_csetid r_lrev fi -- cgit 1.4.1