Re: What's cooking in git.git (Nov 2009, #07; Sun, 29)

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 30, 2009, 07:34 UTC
Message-ID: <7vfx7wxy7r.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vocmlbq8d.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> This will be the last update before deciding what should go in 1.6.6-rc1
> and describes my current thinking.

I do not want to decide unilaterally what will be in and what will be left out of 1.6.6, so here is a seocnd call for comments.

I said "Perhaps merge it to 'master' before 1.6.6-rc1?" for these:

Show 8 quoted lines

> * uk/maint-shortlog-encoding (2009-11-25) 1 commit.
> * fc/send-email-envelope (2009-11-26) 2 commits.
> * jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
> * tr/reset-checkout-patch (2009-11-19) 1 commit.
> * em/commit-claim (2009-11-04) 1 commit
> * cc/bisect-doc (2009-11-08) 1 commit
> * jc/pretty-lf (2009-10-04) 1 commit.
> * ns/send-email-no-chain-reply-to (2009-11-29) 1 commit

I didn't say so in the message but I think this is Ok for 1.6.6-rc1.

> * bw/diff-color-hunk-header (2009-11-27) 2 commits

I would love to see necessary fix-ups to make them suitable and include in the 1.6.6 final for these:

> * jn/gitweb-blame (2009-11-24) 8 commits.

I am inclined to keep the rest out of 1.6.6.

Even though I did it myself, I am ambivalent about the diff.bwoutputonly anti-procrastination measure. The send-email one looked fine and is a welcome addition to the "don't surprise users" effort to prepare for 1.7.0, and diff.bwoutputonly is in a sense in a similar spirit, but an option to keep an old and broken semantics feels somewhat wrong.

Also anybody has comments on the part for preparing users for 1.7.0 in the draft release notes?