Merge branch 'jc/rebase-limit'

diff --git a/ident.c b/ident.c
index 0461b8b2f8148d6642689f8ba91af874f0243a1e..23b8cfc600dfa7910d6b9afdfed8bcdf8b033781 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -167,6 +167,11 @@ static const char *get_ident(const char *name, const char *email,
                name = git_default_name;
        if (!email)
                email = git_default_email;
+
+       if (!*name || !*email)
+               die("empty ident %s <%s> not allowed",
+                   name, email);
+
        strcpy(date, git_default_date);
        if (date_str)
                parse_date(date_str, date, sizeof(date));