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

Re: What's cooking in git.git (Jun 2019, #06; Wed, 26)

From
BRBarret Rhoden <brho@google.com>
Date
Jul 1, 2019, 17:55 UTC
Message-ID
<ad5d38d0-167e-4e34-e994-2bc2a271b50b@google.com>
In-Reply-To
<xmqqmuhx7m6i.fsf@gitster-ct.c.googlers.com>
On 7/1/19 12:29 PM, Junio C Hamano wrote:
Show 37 quoted lines
> 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.
> 
Sounds good, thanks.  Please disregard my v10 series then.

The other change in my v10 was squashing the following commit, which you might want to grab for next:

https://public-inbox.org/git/20190630181732.4128-1-michael@platin.gs/
Thanks,
Barret
Previous: Junio C HamanoNext: Thomas Gummerer
Message 9 of 11 in “What's cooking in git.git (Jun 2019, #06; Wed, 26)”
  1. Junio C HamanoJun 26, 2019
  2. Jonathan TanJun 26, 2019
  3. Junio C HamanoJun 27, 2019
  4. Matthew DeVoreJun 27, 2019
  5. Junio C HamanoJun 28, 2019
  6. Jeff KingJun 28, 2019
  7. Barret RhodenJul 1, 2019
  8. Junio C HamanoJul 1, 2019
  9. Barret RhodenJul 1, 2019
  10. Thomas GummererJun 28, 2019
  11. Phillip WoodJun 29, 2019

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.