git p4 test: wait longer for p4d to start and test its pid

diff --git a/ident.c b/ident.c
index c42258f4ea530a303aaaa27b077af4bc8109dd92..443c0751bd1f63c059649f9f7f9174349cc1d270 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -205,7 +205,7 @@ int split_ident_line(struct ident_split *split, const char *line, int len)
        if (!split->mail_begin)
                return status;
 
-       for (cp = split->mail_begin - 2; line < cp; cp--)
+       for (cp = split->mail_begin - 2; line <= cp; cp--)
                if (!isspace(*cp)) {
                        split->name_end = cp + 1;
                        break;
@@ -288,6 +288,12 @@ const char *fmt_ident(const char *name, const char *email,
                name = pw->pw_name;
        }
 
+       if (strict && email == git_default_email.buf &&
+           strstr(email, "(none)")) {
+               fputs(env_hint, stderr);
+               die("unable to auto-detect email address (got '%s')", email);
+       }
+
        if (want_date) {
                if (date_str && date_str[0]) {
                        if (parse_date(date_str, date, sizeof(date)) < 0)