From: Barret Rhoden <brho@google.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"David Kastrup" <dak@gnu.org>, "Jeff King" <peff@peff.net>,
"Jeff Smith" <whydoubt@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>,
"Stefan Beller" <stefanbeller@gmail.com>
Subject: [PATCH v4 0/4] blame: add the ability to ignore commits
Date: Tue, 26 Feb 2019 12:06:44 -0500 [thread overview]
Message-ID: <20190226170648.211847-1-brho@google.com> (raw)
This patch set adds the ability to ignore a set of commits and their
changes when blaming. This can be used to ignore a commit deemed 'not
interesting,' such as reformatting.
v3 -> v4
v3: https://public-inbox.org/git/20190212222722.240676-1-brho@google.com/
- Cleaned up the tests, especially removing usage of sed -i.
- Squashed the 'tests' commit into the other blame commits. Let me know
if you'd like further squashing.
v2 -> v3
v2: https://public-inbox.org/git/20190117202919.157326-1-brho@google.com/
- SHA-1 -> "object name", and fixed other comments
- Changed error string for oidset_parse_file()
- Adjusted existing fsck tests to handle those string changes
- Return hash of all zeros for lines we know we cannot identify
- Allow repeated options for blame.ignoreRevsFile and
--ignore-revs-file. An empty file name resets the list. Config
options are parsed before the command line options.
- Rebased to master
- Added regression tests
v1 -> v2
v1: https://public-inbox.org/git/20190107213013.231514-1-brho@google.com/
- extracted the skiplist from fsck to avoid duplicating code
- overhauled the interface and options
- split out markIgnoredFiles
- handled merges
Barret Rhoden (4):
Move init_skiplist() outside of fsck
blame: use a helper function in blame_chunk()
blame: add the ability to ignore commits and their changes
blame: add a config option to mark ignored lines
Documentation/blame-options.txt | 16 +++
Documentation/config/blame.txt | 11 ++
Documentation/git-blame.txt | 1 +
blame.c | 115 ++++++++++++++----
blame.h | 4 +
builtin/blame.c | 51 ++++++++
fsck.c | 37 +-----
oidset.c | 35 ++++++
oidset.h | 8 ++
t/t5504-fetch-receive-strict.sh | 14 +--
t/t8013-blame-ignore-revs.sh | 199 ++++++++++++++++++++++++++++++++
11 files changed, 423 insertions(+), 68 deletions(-)
create mode 100755 t/t8013-blame-ignore-revs.sh
--
2.21.0.rc2.261.ga7da99ff1b-goog
next reply other threads:[~2019-02-26 17:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 17:06 Barret Rhoden [this message]
2019-02-26 17:06 ` [PATCH v4 1/4] Move init_skiplist() outside of fsck Barret Rhoden
2019-02-26 17:06 ` [PATCH v4 2/4] blame: use a helper function in blame_chunk() Barret Rhoden
2019-02-26 17:06 ` [PATCH v4 3/4] blame: add the ability to ignore commits and their changes Barret Rhoden
2019-02-26 17:06 ` [PATCH v4 4/4] blame: add a config option to mark ignored lines Barret Rhoden
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190226170648.211847-1-brho@google.com \
--to=brho@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
--cc=whydoubt@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).