Merge branch 'ls/filter-process-delayed'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:24 +0000 (14:52 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:24 +0000 (14:52 +0900)
Bugfixes to an already graduated series.

* ls/filter-process-delayed:
  write_entry: untangle symlink and regular-file cases
  write_entry: avoid reading blobs in CE_RETRY case
  write_entry: fix leak when retrying delayed filter
  entry.c: check if file exists after checkout
  entry.c: update cache entry only for existing files

1  2 
entry.c

diff --cc entry.c
+++ b/entry.c
@@@ -333,9 -330,10 +344,10 @@@ static int write_entry(struct cache_ent
                        fstat_done = fstat_output(fd, state, &st);
                close(fd);
                free(new);
 -              if (wrote != size)
 +              if (wrote < 0)
                        return error("unable to write file %s", path);
                break;
        case S_IFGITLINK:
                if (to_tempfile)
                        return error("cannot create temporary submodule %s", path);