From: rhatto <rhatto@ratatosk.fluxo.info>
Date: Fri, 14 Mar 2014 16:22:36 +0000 (-0300)
Subject: Use --include at git config
X-Git-Tag: 0.3.1~3
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=86835f829aacd8466e1fbc908b77de75d722423d;p=keyringer.git

Use --include at git config
---

diff --git a/keyringer b/keyringer
index 0ec90be..a8dd5c7 100755
--- a/keyringer
+++ b/keyringer
@@ -40,8 +40,8 @@ function keyringer_init {
   fi
 
   # Check user configuration: git might complain if those aren't set
-  if [ -z "`git config --global --get user.name`" ] || [ -z "`git config --global --get user.email`" ]; then
-    echo "Please chose the name and email address that should identify your changes in the new keyring."
+  if [ -z "`git config --global --includes --get user.name`" ] || [ -z "`git config --global --includes --get user.email`" ]; then
+    echo "No git config found, so please chose a name and email address to identify your changes in the new keyring repository."
     read -p "Enter your desired name/pseudonym: " name
     read -p "Enter your desired email address: " email