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

diff --git a/diff.c b/diff.c
index 77edd5086fff30af36e92a151377c285de21aca3..1a594df4f45bf0bc8409e871535f7ebd34684c6c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1700,7 +1700,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
                        continue;
                if (!data->files[i]->is_renamed && (added + deleted == 0)) {
                        total_files--;
-               } else {
+               } else if (!data->files[i]->is_binary) { /* don't count bytes */
                        adds += added;
                        dels += deleted;
                }