From 1b0541c52fa20be241a7e601e7650731741d5797 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Tue, 21 Feb 2017 20:45:18 -0800 Subject: Julien Nicoulaud: 40586: discard stderr --- ChangeLog | 5 +++++ Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d06dbfb01..f3879afc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-02-21 Barton E. Schaefer + + * Julien Nicoulaud: 40586: + Functions/VCS_Info/Backends/VCS_INFO_get_data_git: discard stderr + 2017-02-20 Barton E. Schaefer * unposted: Test/ztst.zsh: use "diff -a" in case special characters diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 192b0a10d..f3dd95dcb 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -156,7 +156,7 @@ if (( querystaged || queryunstaged )) && \ [[ "$(${vcs_comm[cmd]} rev-parse --is-inside-work-tree 2> /dev/null)" == 'true' ]] ; then # Default: off - these are potentially expensive on big repositories if (( queryunstaged )) ; then - ${vcs_comm[cmd]} diff --no-ext-diff --ignore-submodules=dirty --quiet --exit-code || + ${vcs_comm[cmd]} diff --no-ext-diff --ignore-submodules=dirty --quiet --exit-code 2> /dev/null || gitunstaged=1 fi if (( querystaged )) ; then -- cgit 1.4.1