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

diff --git a/commit.h b/commit.h
index ccaa20b2621bd3856f7eafbe1193a20326278ae3..d617fa3f28d9fecf0bbf8e87c373f8701c286227 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -84,6 +84,7 @@ struct pretty_print_context {
        const char *after_subject;
        int preserve_subject;
        enum date_mode date_mode;
+       unsigned date_mode_explicit:1;
        int need_8bit_cte;
        int show_notes;
        struct reflog_walk_info *reflog_info;