Re: [PATCH] checkout: don't write merge results into the object database

René Scharfe writes: >> If it is a concern, I think it could be solved by "unpretending" after >> our call to checkout_entry completes. That would need a new call in >> sha1_file.c, but it should be easy to write. > > Good point; we'd accumulate fake entries that we'll never need again. Hopefull

Re: [PATCH] checkout: don't write merge results into the object database

Am 15.06.2017 um 15:57 schrieb Jeff King: > On Thu, Jun 15, 2017 at 01:33:42PM +0200, René Scharfe wrote: > >> Merge results need to be written to the worktree, of course, but we >> don't necessarily need object entries for them, especially if they >> contain conflict markers. Use pretend_sha1_fi

Re: [PATCH] checkout: don't write merge results into the object database

On Thu, Jun 15, 2017 at 01:33:42PM +0200, René Scharfe wrote: > Merge results need to be written to the worktree, of course, but we > don't necessarily need object entries for them, especially if they > contain conflict markers. Use pretend_sha1_file() to create fake > blobs to pass to make_cache

[PATCH] checkout: don't write merge results into the object database

Merge results need to be written to the worktree, of course, but we don't necessarily need object entries for them, especially if they contain conflict markers. Use pretend_sha1_file() to create fake blobs to pass to make_cache_entry() and checkout_entry() instead. Signed-off-by: Rene Scharfe --