git-check-attr: test that no output is written to stderr

[git.git] / entry.c

diff --git a/entry.c b/entry.c
index da37d0151413b50dd3e4cc223f71ce55643f349b..852fea13955475c1e2fda9cfc25a63a54a1f61c7 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -116,6 +116,7 @@ static int fstat_output(int fd, const struct checkout *state, struct stat *st)
 }
 
 static int streaming_write_entry(struct cache_entry *ce, char *path,
+                                struct stream_filter *filter,
                                 const struct checkout *state, int to_tempfile,
                                 int *fstat_done, struct stat *statbuf)
 {
@@ -123,9 +124,10 @@ static int streaming_write_entry(struct cache_entry *ce, char *path,
        enum object_type type;
        unsigned long sz;
        int result = -1;
+       ssize_t kept = 0;
        int fd = -1;
 
-       st = open_istream(ce->sha1, &type, &sz);
+       st = open_istream(ce->sha1, &type, &sz, filter);
        if (!st)
                return -1;
        if (type != OBJ_BLOB)
@@ -136,18 +138,34 @@ static int streaming_write_entry(struct cache_entry *ce, char *path,
                goto close_and_exit;
 
        for (;;) {
-               char buf[10240];
-               ssize_t wrote;
+               char buf[1024 * 16];
+               ssize_t wrote, holeto;
                ssize_t readlen = read_istream(st, buf, sizeof(buf));
 
                if (!readlen)
                        break;
+               if (sizeof(buf) == readlen) {
+                       for (holeto = 0; holeto < readlen; holeto++)
+                               if (buf[holeto])
+                                       break;
+                       if (readlen == holeto) {
+                               kept += holeto;
+                               continue;
+                       }
+               }
 
+               if (kept && lseek(fd, kept, SEEK_CUR) == (off_t) -1)
+                       goto close_and_exit;
+               else
+                       kept = 0;
                wrote = write_in_full(fd, buf, readlen);
 
                if (wrote != readlen)
                        goto close_and_exit;
        }
+       if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 ||
+                    write(fd, "", 1) != 1))
+               goto close_and_exit;
        *fstat_done = fstat_output(fd, state, statbuf);
 
 close_and_exit:
@@ -169,11 +187,14 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
        size_t wrote, newsize = 0;
        struct stat st;
 
-       if ((ce_mode_s_ifmt == S_IFREG) &&
-           can_bypass_conversion(path) &&
-           !streaming_write_entry(ce, path, state, to_tempfile,
-                                  &fstat_done, &st))
-               goto finish;
+       if (ce_mode_s_ifmt == S_IFREG) {
+               struct stream_filter *filter = get_stream_filter(path, ce->sha1);
+               if (filter &&
+                   !streaming_write_entry(ce, path, filter,
+                                          state, to_tempfile,
+                                          &fstat_done, &st))
+                       goto finish;
+       }
 
        switch (ce_mode_s_ifmt) {
        case S_IFREG: