Re: [PATCH v5 10/10] merge-recursive: combine error handling

2018-11-07 Thread Junio C Hamano
Elijah Newren writes: > From: Derrick Stolee > > In handle_rename_rename_1to2(), we have duplicated error handling > around colliding paths. Specifically, when we want to write out > the file and there is a directory or untracked file in the way, > we need to create a temporary file to hold the

[PATCH v5 10/10] merge-recursive: combine error handling

2018-11-07 Thread Elijah Newren
From: Derrick Stolee In handle_rename_rename_1to2(), we have duplicated error handling around colliding paths. Specifically, when we want to write out the file and there is a directory or untracked file in the way, we need to create a temporary file to hold the contents. This has some special