Merge branch 'jc/empty-commit'

* jc/empty-commit: t6000: fix a careless test library add-on. Do not allow empty name or email.
git-mirror · Feb 10, 2006 · 4d44cb1 · 4d44cb1
2 parents cf7bb58 + 47e013f
commit 4d44cb1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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()