Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/mailsplit.c b/mailsplit.c
index eb58b1ebe430a1a1acf189097c5277545e3b67e9..c529e2d060b610d8f0dd80464634a954c4d058e8 100644 (file)
--- a/mailsplit.c
+++ b/mailsplit.c
@@ -11,7 +11,6 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <stdio.h>
-#include <assert.h>
 #include "cache.h"
 
 static const char git_mailsplit_usage[] =
@@ -169,8 +168,11 @@ int main(int argc, const char **argv)
                if ( !f )
                        die ("cannot open mbox %s", file);
 
-               if (fgets(buf, sizeof(buf), f) == NULL)
+               if (fgets(buf, sizeof(buf), f) == NULL) {
+                       if (f == stdin)
+                               break; /* empty stdin is OK */
                        die("cannot read mbox %s", file);
+               }
 
                while (!file_done) {
                        sprintf(name, "%s/%0*d", dir, nr_prec, ++nr);