Re: [PATCH 3/3] merge-recursive: Avoid incorporating uncommitted changes in a merge

2018-01-08 Thread Junio C Hamano
Elijah Newren writes: > diff --git a/merge-recursive.c b/merge-recursive.c > index 2ecf495cc2..780f81a8bd 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > @@ -1952,6 +1952,13 @@ int merge_trees(struct merge_options *o, > } > > if (oid_eq(>object.oid,

Re: [PATCH 3/3] merge-recursive: Avoid incorporating uncommitted changes in a merge

2017-12-22 Thread Junio C Hamano
Elijah Newren writes: > builtin/merge.c contains this important requirement for merge strategies: > /* >* At this point, we need a real merge. No matter what strategy >* we use, it would operate on the index, possibly affecting the >* working

[PATCH 3/3] merge-recursive: Avoid incorporating uncommitted changes in a merge

2017-12-21 Thread Elijah Newren
builtin/merge.c contains this important requirement for merge strategies: /* * At this point, we need a real merge. No matter what strategy * we use, it would operate on the index, possibly affecting the * working tree, and when resolved cleanly, have the