Re: [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix)

On Tue, Aug 17, 2010 at 06:51, Jonathan Nieder [off-list ref] wrote:

While preparing to make some minor "git merge" changes, I noticed that
the old merge script does not pass all tests any more.  Since it can
be easier to prototype in shell and then port to C, I think that is
worth fixing.

Of course this is not urgent at all.

Patches 2-7 are minor test changes.  They are early in the series
to give flexibility about when to merge them.

Those all looked good, thanks for tackling that.

Patches 8-10 expose functionality used by merge when handling octopus
merges.

You mean 9-10, 8 looks good. I don't have the familiarity to comment
on 9-10.

Patches 12 and later are ports of various patches to builtin/merge.c.
I did the bare minimum to make tests pass. :)

Those also look good to my untrained eye.

How do you run the tests against git-merge.sh? Is there some make
target to use it instead of git-merge.c, or do you manually move it in
place?

If it's the latter a switch somewhere to run the test suite against
these .sh alternatives might compliment this series nicely.