Merge early part of 'jc/combine' branch

[git.git] / pack-objects.c

diff --git a/pack-objects.c b/pack-objects.c
index 0ea16ad..d7ba938 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1118,9 +1118,10 @@ int main(int argc, char **argv)
                                break;
                        if (!ferror(stdin))
                                die("fgets returned NULL, not EOF, not error!");
-                       if (errno == EINTR)
-                               continue;
-                       die("fgets: %s", strerror(errno));
+                       if (errno != EINTR)
+                               die("fgets: %s", strerror(errno));
+                       clearerr(stdin);
+                       continue;
                }
 
                if (line[0] == '-') {