git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: 2.11.0-rc1 will not be tagged for a few days

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 9, 2016, 23:35 UTC
Message-ID
<xmqq1syk8bw8.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20161109165125.t4x2w7u5uxe57xm2@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> It's just that I found myself writing up notes like "this should be
> merged", and it occurred to me that I could communicate the same things
> by sending you a proposed history. So I'm curious if you find dissecting
> it via "git log" more or less convenient than a list of notes. :)
Yes, I think this is a very readable form of communication.

What's especially nice in what you did is that comparing outputs of these two commands

    $ git log --no-merges --oneline master..peff/for-junio/master
    $ git log --no-merges --oneline ^pu master..peff/for-junio/master

clearly shows that you reused what I already had in 'pu' and the ones missing from 'pu' are the ones I need to check and possibly may want to sign-off myself.

I also need to note that while this is very handy format for the recipient, hence a very good way to do "pass the pumpkin" between maintainers, it is a less "open" way of communication than laying out everything on the list (cf. http://youtu.be/L8OOzaqS37s), but it is the most appropriate method in this case, I would think.

> It looks like Johannes prefers replacements for some of the fixes from
> yesterday.

As to that change, I agree with you that I do not care too deeply about the shape of an interim step as long as the finished product uses the better one between the alternatives, but at the same time, because we are including it as a hot-fix in a released product, even though it is an interim step in the bigger picture, I want it to be using the better one, too. So I am leaning towards taking what you queued for me for the reasons you stated in the other thread [*1*].

That would probably mean Dscho needs a bit of rebase in the remaining parts of his series that adds new elements to the enum, but I am hoping that he can afford that time now in the feature freeze period. If we take the _INVALID thing instead now, the remaining series from Dscho that we would review and queue for the next cycle would need to begin with a "fixup" patch that stops doing the _INVALID thing and instead using the "compare after casting to size_t", so it is just the matter of doing the adjustment before or after the remainder of the series are posted on the list for the next release, and the smaller number of "oops that was not nice, let's fix it" patches in the published history, the better the long term health of the project, I would think.

The other fixes in your collection looked all sensible.  Thanks.
[Footnote]
*1* The convention of keeping _INVALID at the end can be arguably
    made safe from future programmer screw-ups, as long as it is
    guarded by a good comment nearby.  But the solution to cast
    would avoid having to have that potential brittleness in the
    first place.  I find the other merit of taking care of negative
    enum automatically quite attractive, too.
Previous: Jeff KingNext: Junio C Hamano
Message 7 of 21 in “2.11.0-rc1 will not be tagged for a few days”
  1. Junio C HamanoNov 7, 2016
  2. Jeff KingNov 8, 2016
  3. Johannes SixtNov 8, 2016
  4. Jeff KingNov 8, 2016
  5. Junio C HamanoNov 9, 2016
  6. Jeff KingNov 9, 2016
  7. Junio C HamanoNov 9, 2016
  8. Junio C HamanoNov 9, 2016
  9. Junio C HamanoNov 10, 2016
  10. Junio C HamanoNov 11, 2016
  11. Johannes SchindelinNov 11, 2016
  12. Johannes SchindelinNov 11, 2016
  13. Lars SchneiderNov 11, 2016
  14. Lars SchneiderNov 11, 2016
  15. Lars SchneiderNov 11, 2016
  16. Johannes SixtNov 11, 2016
  17. Junio C HamanoNov 11, 2016
  18. Junio C HamanoNov 11, 2016
  19. Johannes SixtNov 11, 2016
  20. Lars SchneiderNov 12, 2016
  21. Junio C HamanoNov 11, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.