Merge branches 'jc/nostat' and 'jc/empty-commit'

* jc/nostat:
ls-files: debugging aid for CE_VALID changes.
"Assume unchanged" git: do not set CE_VALID with --refresh
"Assume unchanged" git

* jc/empty-commit:
t6000: fix a careless test library add-on.
Do not allow empty name or email.

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));

diff --git a/t/t6000lib.sh b/t/t6000lib.sh
index 01f796e9c827aff02c3161ac940626dd4d8edb9b..c6752af48e04993e3ed3efebf288ffa86d02633a 100755 (executable)
--- 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()