summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Ching <chingcodes@google.com>2017-10-19 11:30:00 -0600
committerChris Ching <chingcodes@chromium.org>2017-10-19 20:13:06 +0000
commit782b9a7b755fccf43cc37e60e89fa5c146e68a99 (patch)
tree9ece4bb8e99b9457a22adff54f55a377bbe5630c
parent025e0ccc59e6e10d7dd9ba6aa96fec586dc47c9e (diff)
Makefile.inc: remove '--global' flag from config check for gitconfig rule
As long as user.name and user.email are set, gitconfig should pass. This handles if values are only set for the local repo, or if values are stored in ~/.config/git/config BUG=none TEST=make gitconfig Change-Id: Ie01e7a155f9e6db35d5991e4303aad85fb277a06 Signed-off-by: Chris Ching <chingcodes@google.com> Reviewed-on: https://review.coreboot.org/22109 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--Makefile.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc
index fefc8d19bb..ea56a098cd 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -595,7 +595,7 @@ gitconfig:
git config remote.origin.push HEAD:refs/for/master
git config alias.sup '!git submodule update --remote --rebase && git submodule update --init --checkout'
git config alias.sup-destroy '!git submodule deinit --force "$$(git rev-parse --show-toplevel)"; git submodule init && git submodule update --checkout'
- (git config --global --includes user.name >/dev/null && git config --global --includes user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
+ (git config --includes user.name >/dev/null && git config --includes user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
include util/crossgcc/Makefile.inc