Re: What's cooking in git.git (May 2017, #08; Mon, 29)

From: Stefan Beller <sbeller@google.com>
Date: May 30, 2017, 17:42 UTC
Message-ID: <CAGZ79kZWmLnUr5hyKjy8bKFAksURW9a65035CHispAT0oH1rkA@mail.gmail.com>
In-Reply-To: <xmqq1sr889lb.fsf@gitster.mtv.corp.google.com>

On Sun, May 28, 2017 at 11:23 PM, Junio C Hamano <gitster@pobox.com> wrote:

> A bit more topics are now in 'master'.  One unfortunate thing is
> that the SHA1 breakage in 2.13 for big-endian platforms were lost in
> the noise with excitement felt by some subset of contributors with
> the possible use of submodules.

I am sorry about being excited, without considering the immediate pressing issues.

> The first step in the series is
> neutral to the excitement, and should be fast-tracked down to
> 'maint' soonish.

Yes I agree on that. Thanks for being calm and unexcited about that!

>
>
> * sb/diff-color-move (2017-05-25) 17 commits
>  - diff.c: color moved lines differently

...

>
>  "git diff" has been taught to optionally paint new lines that are
>  the same as deleted lines elsewhere differently from genuinely new
>  lines.

My current understanding is that we agree on having the first n-1 patches in good shape[1] and are only discussing how the exact line coloring algorithm should look like, so I resent that separately[2]. While it has better documentation and tests (also a command line option) Philip still found some issues in there, so I will revisit that patch once more.

[1] https://public-inbox.org/git/xmqq7f15e8pu.fsf@gitster.mtv.corp.google.com/ [2] https://public-inbox.org/git/20170527001820.25214-2-sbeller@google.com/

>
> * sb/submodule-blanket-recursive (2017-05-23) 6 commits

...

>
>  Retracted for now.
>  cf. <CAGZ79kZexcwh=E6_ks83=pJh=ZvKnLvJ54eLsn+HURsTZOpvqg@mail.gmail.com>

And the retraction is retracted by sending a new series. You remarked that it still misbehaves with other series in flight, so I'll inspect it again.