Re: [PATCH 1/2] merge: close the index lock when not writing the new index

On 11 November 2017 at 00:13, Joel Teichroeb wrote: > If the merge does not have anything to do, it does not unlock the index, > causing any further index operations to fail. Thus, always unlock the index > regardless of outcome. > if (clean < 0) >

[PATCH 1/2] merge: close the index lock when not writing the new index

If the merge does not have anything to do, it does not unlock the index, causing any further index operations to fail. Thus, always unlock the index regardless of outcome. Signed-off-by: Joel Teichroeb --- merge-recursive.c | 9 ++--- 1 file changed, 6 insertions(+), 3