From: Josh Steadmon <steadmon@google.com>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 1/1] apply --recount: allow "no-op hunks"
Date: Mon, 12 Nov 2018 15:12:14 -0800 [thread overview]
Message-ID: <20181112231214.GB126896@google.com> (raw)
In-Reply-To: <dffe2e1144e4a3533f67784abd36671b078105d3.1542056085.git.gitgitgadget@gmail.com>
On 2018.11.12 12:54, Johannes Schindelin via GitGitGadget wrote:
> 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>
prev parent reply other threads:[~2018-11-12 23:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-12 20:54 [PATCH 0/1] Allow "no-op hunks" when editing the diff in git add -e Johannes Schindelin via GitGitGadget
2018-11-12 20:54 ` [PATCH 1/1] apply --recount: allow "no-op hunks" Johannes Schindelin via GitGitGadget
2018-11-12 23:12 ` Josh Steadmon [this message]
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=20181112231214.GB126896@google.com \
--to=steadmon@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.