[PATCH 0/4]

Linus,

	as promised, I am sending a couple of further cleanup,
and a pair of new diffcore routines.

I am assuming that you would have applied the three clean-up patches I sent after you rejected some of my 12-piece set, before you use these four. They come on top of the previous three. Although I do not think they depend on the previous three, I am letting you know that that was how I tested these four:

    [PATCH 1/4] diff: further cleanup.
    [PATCH 2/4] diff: fix the culling of unneeded delete record.
    [PATCH 3/4] Add -B flag to diff-* brothers.
    [PATCH 4/4] Add -O<orderfile> option to diff-* brothers.

The third one is the gem of this series. I think I covered the basics I can think of in the new test script, but there could still be cases that rename/copy detector does something interesting when broken pairs are involved. Please give it a good beating before you use it for anything important. This being diff routine, it obviously cannot corrupt your data, though.

The fourth one was what both you and Petr expressed reluctance, although Thomas was supportive. I admit it is of "nice to have" category not "great we need to have it inside" category, but it is my favorite.

Oh, before I forget, I was wondering if you want me to mark broken pair in any special way, just line I mark matched rename/copy pairs. Something along the lines of:

    diff --git a/foo b/foo
    dissimilarity index 100%
    deleted file mode 100644
    --- a/foo
    +++ /dev/null
    @@ ...
    diff --git a/foo b/foo
    dissimilarity index 100%
    new file mode 100644
    --- /dev/null
    +++ a/foo
    @@ ...