From 3738b70ad32e2bfad52dee4db6308477b8e8fad4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 29 Jan 2019 15:19:49 +0900 Subject: [PATCH] git hooks: fix submodule check sloppy match Submodule check used to match any file containing submodule name (e.g. lib/include/ihk/foo would match ihk and incorrectly be identified as a submodule change) -- properly check for full name with anchors instead Change-Id: Ib4330aec97e9da713cd3ab9e791962f2e0c8d396 --- scripts/git_hooks/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git_hooks/pre-commit b/scripts/git_hooks/pre-commit index 9497372d..5572230a 100755 --- a/scripts/git_hooks/pre-commit +++ b/scripts/git_hooks/pre-commit @@ -44,7 +44,7 @@ fi SUBMODULES=$(sed -ne 's/^.*path = //p' "${ROOT_DIR}/.gitmodules") # Finding the submodules that have been modified -MOD_SUBMODULES=$(git diff --cached --name-only | grep -F "$SUBMODULES") +MOD_SUBMODULES=$(git diff --cached --name-only | grep -E "^(${SUBMODULES//$'\n'/|})$") # If no modified submodules, exit with status code 0, else prompt the # user and exit accordingly