[PATCH v3 0/2] blame: ignore revs in HEAD:.git-blame-ignore-revs by default
- From
- Ravi Mistry via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Oct 11, 2026, 22:21 UTC
- Message-ID
- <pull.2224.v3.git.1791757294.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.2224.git.1789169384240.gitgitgadget@gmail.com>
This series teaches git-blame(1) and git-annotate(1) to automatically use the HEAD:.git-blame-ignore-revs blob by default if it exists, so local runs match hosting platforms without requiring manual blame.ignoreRevsFile configuration in every clone. This restarts the stalled attempt in PR https://github.com/gitgitgadget/git/pull/1809 (https://lore.kernel.org/git/pull.1809.v2.git.1728707867.gitgitgadget@gmail.com/) and addresses https://github.com/gitgitgadget/git/issues/1494.
Changes since v2:
* Patch 2/2 uses sb->repo instead of the_repository in parse_default_ignore_revs_blob().
Changes since v1:
* Split the series into two commits.
* Patch 1/2 hardens oidset_parse_file_carefully() in oidset.c and
peel_to_commit_oid() in builtin/blame.c before exposing them to
upstream-controlled content at a well-known path:
* Reject lines containing embedded NUL bytes via memchr() so trailing
bytes after a NUL cannot be silently ignored.
* Pass OBJECT_INFO_LOOKUP_REPLACE | OBJECT_INFO_SKIP_FETCH_OBJECT |
OBJECT_INFO_QUICK to odb_read_object_info_extended() and peel tags one
layer per iteration so missing OIDs or tag targets do not trigger lazy
promisor fetches or pack directory rescans in partial clones, and
verify that each peeled target matches the tag's declared type.
* Patch 2/2 reads the committed HEAD:.git-blame-ignore-revs blob (in both
bare and non-bare repositories) instead of reading a file from the
working tree, matching hosting platforms even when an untracked file is
present or a tracked one has local modifications. The tree entry is
checked with S_ISREG() so non-regular entries (such as committed
symlinks) are skipped, parsed in memory via
oidset_parse_buffer_carefully(), and bypassed without reading if cleared
via blame.ignoreRevsFile="" or --no-ignore-revs-file.Ravi Mistry (2): blame: harden ignore-revs parser and tag peeling blame: ignore revs in HEAD:.git-blame-ignore-revs
Documentation/blame-options.adoc | 8 +- Documentation/config/blame.adoc | 9 +- builtin/blame.c | 65 ++++++++- oidset.c | 81 ++++++++---- oidset.h | 9 ++ t/t8013-blame-ignore-revs.sh | 220 +++++++++++++++++++++++++++++++ 6 files changed, 357 insertions(+), 35 deletions(-)
base-commit: fa7f9290efe2bd22dd736689597b474b93798e11 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2224%2Frmistry%2Fblame-default-ignore-revs-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2224/rmistry/blame-default-ignore-revs-v3 Pull-Request: https://github.com/gitgitgadget/git/pull/2224
Range-diff vs v2:
1: 2e12486c0d = 1: 2e12486c0d blame: harden ignore-revs parser and tag peeling
2: 35e303d65b ! 2: 72a87d1c34 blame: ignore revs in HEAD:.git-blame-ignore-revs
@@ builtin/blame.c: static int peel_to_commit_oid(struct object_id *oid_ret, void *
+ size_t size;
+ char *buf;
+
-+ if (get_oid_with_context(the_repository, name, GET_OID_QUIETLY,
++ if (get_oid_with_context(sb->repo, name, GET_OID_QUIETLY,
+ &oid, &oc))
+ goto out;
+ if (!S_ISREG(oc.mode))
+ goto out;
+
-+ buf = odb_read_object(the_repository->objects, &oid, &type, &size);
++ buf = odb_read_object(sb->repo->objects, &oid, &type, &size);
+ if (!buf)
+ goto out;
+ if (type == OBJ_BLOB)
+ oidset_parse_buffer_carefully(&sb->ignore_list, buf, size,
-+ the_repository->hash_algo,
++ sb->repo->hash_algo,
+ peel_to_commit_oid, sb);
+ free(buf);
+-- gitgitgadget