summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-07-06 09:31:42 +0000
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-07-07 02:23:18 +0200
commit11ac97bb2b4f9d58e899880f536d437a305f3829 (patch)
tree225707518195be99fa64f8c63ce02f92ed4b1897
parent9d6a17b549ccb200ad9d04c7051e1404741a9d38 (diff)
downloadcoreboot-11ac97bb2b4f9d58e899880f536d437a305f3829.tar.xz
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@chromium.org> Reviewed-on: http://review.coreboot.org/10806 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
-rw-r--r--Makefile.inc9
1 files 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