From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/1] Allow "no-op hunks" when editing the diff in git add -e
Date: Mon, 12 Nov 2018 12:54:47 -0800 (PST) [thread overview]
Message-ID: <pull.74.git.gitgitgadget@gmail.com> (raw)
I use git add -e frequently. Often there are multiple hunks and I end up
deleting the + lines and converting the - lines to context lines, as I like
to stage massive changes in an incremental fashion (and commit those staged
changes incrementally, too).
Some time after I invented git add -e, this feature was broken, and I had to
start identifying and deleting those hunks with no changes.
I finally got around to find the regression, and to fix it. Here is the
outcome of this effort.
Johannes Schindelin (1):
apply --recount: allow "no-op hunks"
apply.c | 2 +-
t/t4136-apply-check.sh | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-74%2Fdscho%2Fapply-recount-empty-hunk-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-74/dscho/apply-recount-empty-hunk-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/74
--
gitgitgadget
next reply other threads:[~2018-11-12 20:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-12 20:54 Johannes Schindelin via GitGitGadget [this message]
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
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=pull.74.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.