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

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

From
PWPhillip Wood <phillip.wood@talktalk.net>
Date
Feb 23, 2018, 13:05 UTC
Message-ID
<f3c34fa9-e8b3-a523-7247-93c4ff2a536d@talktalk.net>
In-Reply-To
<xmqq1shdyidz.fsf@gitster-ct.c.googlers.com>
On 22/02/18 00:31, Junio C Hamano wrote:
Show 18 quoted lines
> * pw/add-p-recount (2018-02-20) 9 commits
>  - add -p: don't rely on apply's '--recount' option
>  - add -p: fix counting when splitting and coalescing
>  - add -p: calculate offset delta for edited patches
>  - add -p: adjust offsets of subsequent hunks when one is skipped
>  - t3701: add failing test for pathological context lines
>  - t3701: don't hard code sha1 hash values
>  - t3701: use test_write_lines and write_script
>  - t3701: indent here documents
>  - add -i: add function to format hunk header
> 
>  "git add -p" has been lazy in coalescing split patches before
>  passing the result to underlying "git apply", leading to corner
>  case bugs; the logic to prepare the patch to be applied after hunk
>  selections has been tightened.
> 
>  Will merge to 'next'.
> 

Could you hold off on this one please, I do a reroll next week with a couple of clean-ups for the tests.

Thanks
Phillip
Previous: Junio C HamanoNext: Elijah Newren
Message 8 of 13 in “What's cooking in git.git (Feb 2018, #03; Wed, 21)”
  1. Junio C HamanoFeb 22, 2018
  2. Brandon WilliamsFeb 22, 2018
  3. Junio C HamanoFeb 22, 2018
  4. Johannes SchindelinFeb 23, 2018
  5. Junio C HamanoFeb 23, 2018
  6. Johannes SchindelinFeb 26, 2018
  7. Junio C HamanoFeb 27, 2018
  8. Phillip WoodFeb 23, 2018
  9. Elijah NewrenFeb 23, 2018
  10. Junio C HamanoFeb 27, 2018
  11. Duy NguyenFeb 26, 2018
  12. Eric SunshineFeb 26, 2018
  13. Jeff HostetlerFeb 27, 2018

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.