Re: [PATCH v4 11/21] range-diff: add tests

From: Stefan Beller <sbeller@google.com>
Date: Jul 30, 2018, 23:40 UTC
Message-ID: <CAGZ79kbnrBHscQUS8WdU9f6edGS=yH9wpVywLGyBxGHU0c_WfQ@mail.gmail.com>
In-Reply-To: <xmqq600wfpfl.fsf@gitster-ct.c.googlers.com>

On Mon, Jul 30, 2018 at 1:18 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 5 quoted lines

> > I already pushed an update to https://github.com/gitgitgadget/git/pull/1.
>
> Should I take "pushed to ... GGG" to mean "do not merge what you
> have to 'next' yet, as there will be an updated series (not
> incremental) being prepared"?

Not speaking for Johannes, but I think that *could* work. On the other hand full rerolls are more expensive to prep (at least for me, I guess GGG might change that)

git range-diff gitgitgadget/pr/1...origin/js/range-diff shows there is

* a different header guard:
   @@ -418,8 +419,8 @@
     --- /dev/null
     +++ b/range-diff.h
     @@
    -+#ifndef RANGE_DIFF_H
    -+#define RANGE_DIFF_H
    ++#ifndef BRANCH_DIFF_H
    ++#define BRANCH_DIFF_H
     +

* another different header guard:
    @@ -239,8 +240,8 @@
     --- /dev/null
     +++ b/linear-assignment.h
     @@
    -+#ifndef LINEAR_ASSIGNMENT_H
    -+#define LINEAR_ASSIGNMENT_H
    ++#ifndef HUNGARIAN_H
    ++#define HUNGARIAN_H
     +

although this one is the other way round. Did you squash in one header guard and Johannes fixed a header guard in a different file?

With that said, I can send my series for more color testing and better diff.c code on top of either. (https://public-inbox.org/git/20180728030448.192177-1-sbeller@google.com/)

Stefan