From 46ab76a7090b5e04105986df16efaa63ea0cc58a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 21 Nov 2017 09:52:10 +0100 Subject: [PATCH] git-hooks: fix pre-commit in submodules translations.git failed with "Can't locate ClangFormat.pm in @INC (you may need to install the ClangFormat module)". Change-Id: Ibbe051c1cb4c1200da58821589b8271434b1f9a6 Reviewed-on: https://gerrit.libreoffice.org/45020 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- .git-hooks/pre-commit | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit index e83e3a36648a..c0464e1c0778 100755 --- a/.git-hooks/pre-commit +++ b/.git-hooks/pre-commit @@ -7,7 +7,6 @@ use strict; use lib "solenv/clang-format"; -use ClangFormat; #use File::Copy; #use Cwd; @@ -112,6 +111,15 @@ sub check_whitespaces($) sub check_style($) { + if (! -e "solenv/clang-format/ClangFormat.pm") + { + # Commit happens in a submodule. + return; + } + + require ClangFormat; + ClangFormat->import(); + my ($h) = @_; my $src = ClangFormat::get_extension_regex(); my @bad_names = ();