From 11ac97bb2b4f9d58e899880f536d437a305f3829 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 6 Jul 2015 09:31:42 +0000 Subject: [PATCH] gitconfig: Improve robustness when blobs aren't present With no blobs present the 'make gitconfig' target failed when trying to add a file to a directory which doesn't exist. Only try to deal with blobs if they're around. Change-Id: I27ed33e2e22bb1571bc73fe55cf45aa1e2310bf1 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/10806 Reviewed-by: Paul Menzel Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- Makefile.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 2f1fe822ae..a6a84313bc 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -426,10 +426,11 @@ gitconfig: fi; \ done # Now set up thehooks for 3rdparty/blobs - if [ util/gitconfig/commit-msg -nt .git/modules/3rdparty/hooks/commit-msg -o \ - ! -x .git/modules/3rdparty/hooks/commit-msg ]; then \ - sed -e "s,%MAKE%,$(MAKE),g" util/gitconfig/commit-msg > .git/modules/3rdparty/hooks/commit-msg; \ - chmod +x .git/modules/3rdparty/hooks/commit-msg; \ + if [ -d .git/modules/3rdparty -a \ + \( util/gitconfig/commit-msg -nt .git/modules/3rdparty/hooks/commit-msg -o \ + ! -x .git/modules/3rdparty/hooks/commit-msg \) ]; then \ + sed -e "s,%MAKE%,$(MAKE),g" util/gitconfig/commit-msg > .git/modules/3rdparty/hooks/commit-msg; \ + chmod +x .git/modules/3rdparty/hooks/commit-msg; \ fi [ -d 3rdparty/blobs ] && cd 3rdparty/blobs && git config remote.origin.push HEAD:refs/for/master git config remote.origin.push HEAD:refs/for/master