Merge branch 'baserock/richardmaw/branch-and-merge-git-config-warnings-v2' of git://git.baserock.org/baserock/baserock/morphbaserock/genivi/baseline/releases/F-0.1

Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius

1 files changed, 17 insertions, 0 deletions

diff --git a/morphlib/git.py b/morphlib/git.py
index c63c21b2..fffc05d0 100644
--- a/morphlib/git.py
+++ b/morphlib/git.py
@@ -183,6 +183,23 @@ def get_user_email(runcmd):
             '    git config --global user.email "me@example.com"\n')
 
 
+def check_config_set(runcmd, keys=("user.name", "user.email"), cwd='.'):
+    ''' Check whether the given keys have values in git config. '''
+    missing = []
+    for key in keys:
+        try:
+            runcmd(['git', 'config', key], cwd=cwd)
+        except cliapp.AppException:
+            missing.append(key)
+    if missing:
+        if len(missing) == 1:
+            emesg = 'Git configuration for %s has not been set' % missing[0]
+        else:
+            emesg = ('Git configuration for keys %s and %s have not been set'
+                     % (', '.join(missing[:-1]), missing[-1]))
+        raise cliapp.AppException(emesg)
+
+
 def set_remote(runcmd, gitdir, name, url):
     '''Set remote with name 'name' use a given url at gitdir'''
     return runcmd(['git', 'remote', 'set-url', name, url], cwd=gitdir)