git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood@talktalk.net>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)
Date: Fri, 23 Feb 2018 13:05:58 +0000	[thread overview]
Message-ID: <f3c34fa9-e8b3-a523-7247-93c4ff2a536d@talktalk.net> (raw)
In-Reply-To: <xmqq1shdyidz.fsf@gitster-ct.c.googlers.com>

On 22/02/18 00:31, Junio C Hamano wrote:
> * 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

  parent reply	other threads:[~2018-02-23 13:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-22  0:31 What's cooking in git.git (Feb 2018, #03; Wed, 21) Junio C Hamano
2018-02-22  0:56 ` Brandon Williams
2018-02-22 18:06   ` Junio C Hamano
2018-02-23 12:11 ` Johannes Schindelin
2018-02-23 19:03   ` Junio C Hamano
2018-02-26 23:23     ` Johannes Schindelin
2018-02-27 20:38       ` Junio C Hamano
2018-02-23 13:05 ` Phillip Wood [this message]
2018-02-23 21:09 ` Elijah Newren
2018-02-27 19:13   ` Junio C Hamano
2018-02-26 10:17 ` Duy Nguyen
2018-02-26 11:17   ` Eric Sunshine
2018-02-27 13:49 ` Jeff Hostetler

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

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

  git send-email \
    --in-reply-to=f3c34fa9-e8b3-a523-7247-93c4ff2a536d@talktalk.net \
    --to=phillip.wood@talktalk.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    /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. 
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 NNTP newsgroup(s).