Merge branch 'kh/commit' into wc/add-i

diff --git a/ident.c b/ident.c
index 9b2a852cb00327a607946caa864fcf31184da28e..5be7533ffd061bee4d3e1c184c375b095cfed575 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -224,13 +224,17 @@ const char *fmt_ident(const char *name, const char *email,
        }
 
        strcpy(date, git_default_date);
-       if (date_str)
-               parse_date(date_str, date, sizeof(date));
+       if (date_str) {
+               if (*date_str)
+                       parse_date(date_str, date, sizeof(date));
+               else
+                       date[0] = '\0';
+       }
 
        i = copy(buffer, sizeof(buffer), 0, name);
        i = add_raw(buffer, sizeof(buffer), i, " <");
        i = copy(buffer, sizeof(buffer), i, email);
-       i = add_raw(buffer, sizeof(buffer), i, "> ");
+       i = add_raw(buffer, sizeof(buffer), i, date[0] ? "> " : ">");
        i = copy(buffer, sizeof(buffer), i, date);
        if (i >= sizeof(buffer))
                die("Impossibly long personal identifier");