]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge-recursive: add a bunch of FIXME comments documenting known bugs
authorElijah Newren <newren@gmail.com>
Sat, 20 Mar 2021 00:03:53 +0000 (00:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2021 19:35:40 +0000 (12:35 -0700)
commit816147e7bab0c7e9c3a578ce166c55d5f7a64a8a
treea82800e28c2aa563512cd47fa843c37accaf633a
parent5291828df8386ebeb01039d1403d9f845d2f6e20
merge-recursive: add a bunch of FIXME comments documenting known bugs

The plan is to just delete merge-recursive, but not until everyone is
comfortable with merge-ort as a replacement.  Given that I haven't
switched all callers of merge-recursive over yet (e.g. git-am still uses
merge-recursive), maybe there's some value documenting known bugs in the
algorithm in case we end up keeping it or someone wants to dig it up in
the future.

Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c