Re: [PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

On Mon, Oct 7, 2019 at 7:36 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor > > I think the above was an earlier incarntion of what is now known as > 8e4ec337 ("merge-recursive: fix the diff3 common ancestor label fo

Re: [PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

Elijah Newren writes: > In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor I think the above was an earlier incarntion of what is now known as 8e4ec337 ("merge-recursive: fix the diff3 common ancestor label for virtual commits", 2019-10-01). > label for virtual commits", 20

Re: [PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

Elijah Newren writes: > This resulted in garbage strings being printed for the virtual merge > bases, which was visible in git.git by just merging commit b744c3af07 > into commit 6d8cb22a4f. There are two ways to fix this: set > opt->ancestor to NULL after using it to avoid re-use, or add a > !o

[PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor label for virtual commits", 2019-09-30) which was a fix to commit 743474cbfa8b ("merge-recursive: provide a better label for diff3 common ancestor", 2019-08-17), the label for the common ancestor was changed from always being