summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ident.c5
-rwxr-xr-xt/t6000lib.sh7
2 files changed, 11 insertions, 1 deletions
diff --git a/ident.c b/ident.c
index 0461b8b2f8..23b8cfc600 100644
--- 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));
diff --git a/t/t6000lib.sh b/t/t6000lib.sh
index 01f796e9c8..c6752af48e 100755
--- a/t/t6000lib.sh
+++ b/t/t6000lib.sh
@@ -51,7 +51,12 @@ as_author()
export GIT_AUTHOR_EMAIL="$_author"
"$@"
- export GIT_AUTHOR_EMAIL="$_save"
+ if test -z "$_save"
+ then
+ unset GIT_AUTHOR_EMAIL
+ else
+ export GIT_AUTHOR_EMAIL="$_save"
+ fi
}
commit_date()