[coreboot-gerrit] New patch to review for coreboot: gitconfig: Improve robustness when blobs aren't present

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10806

-gerrit

commit 3bab117b5dab2c3f3db6cb38c92b8ad16aa3d342
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Mon Jul 6 09:31:42 2015 +0000

    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 <pgeorgi at chromium.org>
---
 Makefile.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 2f1fe82..a6a8431 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