git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index af31abaaf862bb85a72e8052cf28a874d34c714a..b22b0edd65eefacabb648962b9c20c695609a3f5 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -70,11 +70,12 @@ static void insert_one_record(struct shortlog *log,
        else
                free(buffer);
 
+       /* Skip any leading whitespace, including any blank lines. */
+       while (*oneline && isspace(*oneline))
+               oneline++;
        eol = strchr(oneline, '\n');
        if (!eol)
                eol = oneline + strlen(oneline);
-       while (*oneline && isspace(*oneline) && *oneline != '\n')
-               oneline++;
        if (!prefixcmp(oneline, "[PATCH")) {
                char *eob = strchr(oneline, ']');
                if (eob && (!eol || eob < eol))