From 7a1678767f44f200295d88dfea94902718275266 Mon Sep 17 00:00:00 2001 From: Frank Terbeck Date: Sun, 11 Oct 2015 11:54:06 +0200 Subject: 36830: vcs_info: Silence an error message with new git versions Mikael informs me on IRC, that in new versions of git (he used 2.6.1) where the "am" subcommand is now a builtin, a file that is used by the git backend of vcs_info (namely .git/rebase-apply/msg-clean) is not available anymore, leading to an annoying error message: VCS_INFO_get_data_git:232: no such file or directory: .git/rebase-apply/msg-clean This patch checks for the availabiliy of the file before using it, and adjusts the value of the dependant values accordingly. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 6369cf6e9..c8cad2adb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-10-11 Frank Terbeck + + * 36830: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info: Silence an error message with new git versions + 2015-10-06 Peter Stephenson * 36780: Src/params.c: ensure HOME parameter is unset if -- cgit 1.4.1