From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Oct 2017 05:52:24 +0000 (+0900)
Subject: Merge branch 'ls/filter-process-delayed'
X-Git-Tag: v2.15.0-rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6909bf6bd9e2e09db591ac82eda52ed8f6eb4020;p=thirdparty%2Fgit.git

Merge branch 'ls/filter-process-delayed'

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
---

6909bf6bd9e2e09db591ac82eda52ed8f6eb4020
diff --cc entry.c
index 1c7e3c11d5,206363fd15..944c183b0f
--- a/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);