git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Barret Rhoden <brho@google.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2019, #06; Wed, 26)
Date: Mon, 01 Jul 2019 09:29:41 -0700	[thread overview]
Message-ID: <xmqqmuhx7m6i.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <4d466fce-15df-3a73-f5f9-f29bc5b79a04@google.com> (Barret Rhoden's message of "Mon, 1 Jul 2019 10:07:05 -0400")

Barret Rhoden <brho@google.com> writes:

> On 6/28/19 2:24 AM, Jeff King wrote:
>> On Wed, Jun 26, 2019 at 03:29:29PM -0700, Junio C Hamano wrote:
>>
>>> * br/blame-ignore (2019-06-20) 9 commits
>>>   - blame: add a test to cover blame_coalesce()
>>>   - blame: use the fingerprint heuristic to match ignored lines
>>>   - blame: add a fingerprint heuristic to match ignored lines
>>>   - blame: optionally track line fingerprints during fill_blame_origin()
>>>   - blame: add config options for the output of ignored or unblamable lines
>>>   - blame: add the ability to ignore commits and their changes
>>>   - blame: use a helper function in blame_chunk()
>>>   - Move oidset_parse_file() to oidset.c
>>>   - fsck: rename and touch up init_skiplist()
>>>
>>>   "git blame" learned to "ignore" commits in the history, whose
>>>   effects (as well as their presence) get ignored.
>>>
>>>   Will merge to 'next'.
>>>   cf. <20190620163820.231316-1-brho@google.com> (v9)
>>
>> My -Wunused-parameter branch complained about merging with this. Since
>> it's in 'next', we'd want something like this on top, I think (ideally
>> after Barret confirms my hand-waving below).
>
> Looks good to me.

Thanks for a quick response.  I'll queue Peff's fixup on top of what
is shown above.

The patches are already in 'next', so we'll go incremental to fix
any issues discovered in the series from here on, instead of
replacing the series wholesale.

Thanks.

  reply	other threads:[~2019-07-01 16:29 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-26 22:29 What's cooking in git.git (Jun 2019, #06; Wed, 26) Junio C Hamano
2019-06-26 22:41 ` Jonathan Tan
2019-06-27 17:11   ` Junio C Hamano
2019-06-27 19:48 ` Matthew DeVore
2019-06-28  2:26   ` Junio C Hamano
2019-06-28  6:24 ` Jeff King
2019-07-01 14:07   ` Barret Rhoden
2019-07-01 16:29     ` Junio C Hamano [this message]
2019-07-01 17:55       ` Barret Rhoden
2019-06-28 19:11 ` Thomas Gummerer
2019-06-29 14:08   ` Phillip Wood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqmuhx7m6i.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=brho@google.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).