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

Re: [PATCH 1/1] apply --recount: allow "no-op hunks"

From
Josh Steadmon <steadmon@google.com>
Date
Nov 12, 2018, 23:12 UTC
Message-ID
<20181112231214.GB126896@google.com>
In-Reply-To
<dffe2e1144e4a3533f67784abd36671b078105d3.1542056085.git.gitgitgadget@gmail.com>
On 2018.11.12 12:54, Johannes Schindelin via GitGitGadget wrote:
Show 15 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> When editing patches e.g. in `git add -e`, it is quite common that a
> hunk ends up having no -/+ lines, i.e. it is now supposed to do nothing.
> 
> This use case was broken by ad6e8ed37bc1 (apply: reject a hunk that does
> not do anything, 2015-06-01) with the good intention of catching a very
> real, different issue in hand-edited patches.
> 
> So let's use the `--recount` option as the tell-tale whether the user
> would actually be okay with no-op hunks.
> 
> Add a test case to make sure that this use case does not regress again.
> 
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Looks good to me.
Reviewed-by: Josh Steadmon <steadmon@google.com>
Previous: Johannes Schindelin via GitGitGadget
Message 3 of 3 in “Allow "no-op hunks" when editing the diff in git add -e”
  1. 0/1 Allow "no-op hunks" when editing the diff in git add -eJohannes Schindelin via GitGitGadget, Nov 12, 2018
  2. 1/1 apply --recount: allow "no-op hunks"Johannes Schindelin via GitGitGadget, Nov 12, 2018
  3. Josh SteadmonNov 12, 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.