On Mon, Jun 23, 2008 at 12:15:35AM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: > * mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 14 commits > - Add new test case to ensure git-merge reduces octopus parents when > possible > - Add new test case to ensure git-merge filters for independent > parents > - Build in merge > - Introduce reduce_heads() > - Introduce get_merge_bases_many() > - Add new test to ensure git-merge handles more than 25 refs. > - Introduce get_octopus_merge_bases() in commit.c > - git-fmt-merge-msg: make it usable from other builtins > - Move read_cache_unmerged() to read-cache.c > - parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option > - Add new test to ensure git-merge handles pull.twohead and > pull.octopus > - Move parse-options's skip_prefix() to git-compat-util.h > - Move commit_list_count() to commit.c > - Move split_cmdline() to alias.c "Add new test case to ensure git-merge reduces octopus parents when possible" does exactly the same as "Add new test case to ensure git-merge filters for independent parents", so I think you should drop the later. Only the name of the test and the commit message differs, and I think we want to avoid redundancy in the testsuite. ;-)
Attachment:
pgpH0xvNcTrB3.pgp
Description: PGP signature
