git-blame(1) can ignore a list of commits specified via --ignore-revs-file or the blame.ignoreRevsFile configuration variable. This is useful for skipping uninteresting revisions such as tree-wide formatting changes, large-scale refactors, and code modernizations that would otherwise obscure genuine historical authorship. When revision-ignoring was introduced in commitae3f36dea1("blame: add blame.ignoreRevsFile config option", 2019-10-18), it intentionally avoided adopting a default ignore file. At the time, the capability was new and unproven, so avoiding unrequested filesystem I/O or unexpected attribution shifts took priority over a project-wide default. Requiring explicit opt-in per clone was therefore the prudent design. Since then, maintaining a .git-blame-ignore-revs file at the top level of the repository has become the standard convention across the Git ecosystem, adopted by many open source projects (such as Chromium and LLVM) as well as hosting platforms (GitHub, GitLab, Gerrit). However, git-blame(1) and git-annotate(1) still ignore this file unless each user remembers to manually configure blame.ignoreRevsFile in every local clone. Teach git-blame(1) and git-annotate(1) to automatically add .git-blame-ignore-revs, if it exists, as the initial element in the list of ignore-revs files. Similar to how read_mailmap() handles .mailmap, consult .git-blame-ignore-revs at the root of the working tree when a working tree is available, and otherwise consult the HEAD:.git-blame-ignore-revs blob in bare repositories. Reading only from the working tree in non-bare repositories makes it ergonomic to prepare a new .git-blame-ignore-revs file, edit an existing one, or remove a committed one and immediately test the effect with git-blame(1) before committing, while consulting HEAD:.git-blame-ignore-revs in bare repositories allows them to respect the committed ignore list as well. To ensure consistent precedence, override semantics, and safety when reading upstream-controlled content: - The default .git-blame-ignore-revs entry is added before reading configuration and CLI options, preserving user and repository config overrides. - In git_blame_config(), blame.ignoreRevsFile entries are appended via string_list_append() rather than inserted in sorted order via string_list_insert() so that configuration entries preserve their order relative to the initial default entry. - When a working tree is present, the working-tree .git-blame-ignore-revs path is checked with lstat() and S_ISREG(), opened with open_nofollow(), and verified with fstat() and S_ISREG() so symbolic links and non-regular files are silently skipped. In bare repositories, HEAD:.git-blame-ignore-revs is resolved quietly via get_oid_with_context() and its tree entry mode is checked with S_ISREG() before checking the object. - In both modes, the file or blob size is capped at IGNORE_REVS_MAX_FILE_SIZE (100MB, matching ATTR_MAX_FILE_SIZE from3c50032ff5("attr: ignore overly large gitattributes files", 2022-12-01)) before reading its contents, skipping an oversized file or blob with a warning without loading it into memory. The contents are parsed via a new oidset_parse_buffer_carefully() helper in oidset.c that shares line parsing with oidset_parse_file_carefully(). - In build_ignorelist(), ignore-revs entries are processed starting after the last empty string entry. This ensures setting blame.ignoreRevsFile to "" or passing --ignore-revs-file "" or --no-ignore-revs-file cleanly discards the default entry without attempting to read or parse it, allowing users to bypass a malformed default ignore-revs file. Update documentation in blame-options.adoc and config/blame.adoc, and add test coverage in t8013 for the default working-tree lookup, uncommitted and untracked .git-blame-ignore-revs files, subdirectory invocations, bare repositories, CLI and config overrides, symbolic links, overly large files and blobs, and comments and whitespace handling. Based-on-patch-by: Abhijeetsingh Meena <abhijeet040403@gmail.com> Helped-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Ravi Mistry <rmistry@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
139 lines
3.8 KiB
C
139 lines
3.8 KiB
C
#ifndef OIDSET_H
|
|
#define OIDSET_H
|
|
|
|
#include "khash.h"
|
|
|
|
/**
|
|
* This API is similar to oid-array, in that it maintains a set of object ids
|
|
* in a memory-efficient way. The major differences are:
|
|
*
|
|
* 1. It uses a hash, so we can do online duplicate removal, rather than
|
|
* sort-and-uniq at the end. This can reduce memory footprint if you have
|
|
* a large list of oids with many duplicates.
|
|
*
|
|
* 2. The per-unique-oid memory footprint is slightly higher due to hash
|
|
* table overhead.
|
|
*/
|
|
|
|
/**
|
|
* A single oidset; should be zero-initialized (or use OIDSET_INIT).
|
|
*/
|
|
struct oidset {
|
|
kh_oid_set_t set;
|
|
};
|
|
|
|
#define OIDSET_INIT { { 0 } }
|
|
|
|
|
|
/**
|
|
* Initialize the oidset structure `set`.
|
|
*
|
|
* If `initial_size` is bigger than 0 then preallocate to allow inserting
|
|
* the specified number of elements without further allocations.
|
|
*/
|
|
void oidset_init(struct oidset *set, size_t initial_size);
|
|
|
|
/**
|
|
* Returns true iff `set` contains `oid`.
|
|
*/
|
|
int oidset_contains(const struct oidset *set, const struct object_id *oid);
|
|
|
|
/**
|
|
* Returns true iff `a` and `b` contain the exact same OIDs.
|
|
*/
|
|
bool oidset_equal(const struct oidset *a, const struct oidset *b);
|
|
|
|
/**
|
|
* Insert the oid into the set; a copy is made, so "oid" does not need
|
|
* to persist after this function is called.
|
|
*
|
|
* Returns 1 if the oid was already in the set, 0 otherwise. This can be used
|
|
* to perform an efficient check-and-add.
|
|
*/
|
|
int oidset_insert(struct oidset *set, const struct object_id *oid);
|
|
|
|
/**
|
|
* Insert all the oids that are in set 'src' into set 'dest'; a copy
|
|
* is made of each oid inserted into set 'dest'.
|
|
*/
|
|
void oidset_insert_from_set(struct oidset *dest, struct oidset *src);
|
|
|
|
/**
|
|
* Remove the oid from the set.
|
|
*
|
|
* Returns 1 if the oid was present in the set, 0 otherwise.
|
|
*/
|
|
int oidset_remove(struct oidset *set, const struct object_id *oid);
|
|
|
|
/**
|
|
* Returns the number of oids in the set.
|
|
*/
|
|
static inline int oidset_size(const struct oidset *set)
|
|
{
|
|
return kh_size(&set->set);
|
|
}
|
|
|
|
/**
|
|
* Remove all entries from the oidset, freeing any resources associated with
|
|
* it.
|
|
*/
|
|
void oidset_clear(struct oidset *set);
|
|
|
|
/**
|
|
* Add the contents of the file 'path' to an initialized oidset. Each line is
|
|
* an unabbreviated object name. Comments begin with '#', and trailing comments
|
|
* are allowed. Leading whitespace and empty or white-space only lines are
|
|
* ignored.
|
|
*/
|
|
void oidset_parse_file(struct oidset *set, const char *path,
|
|
const struct git_hash_algo *algop);
|
|
|
|
/*
|
|
* Similar to the above, but with a callback which can (1) return non-zero to
|
|
* signal displeasure with the object and (2) replace object ID with something
|
|
* else (meant to be used to "peel").
|
|
*/
|
|
typedef int (*oidset_parse_tweak_fn)(struct object_id *, void *);
|
|
void oidset_parse_file_carefully(struct oidset *set, const char *path,
|
|
const struct git_hash_algo *algop,
|
|
oidset_parse_tweak_fn fn, void *cbdata);
|
|
|
|
/*
|
|
* Similar to oidset_parse_file_carefully(), but parses lines from an
|
|
* in-memory buffer of 'size' bytes.
|
|
*/
|
|
void oidset_parse_buffer_carefully(struct oidset *set, const char *buf,
|
|
size_t size,
|
|
const struct git_hash_algo *algop,
|
|
oidset_parse_tweak_fn fn, void *cbdata);
|
|
|
|
struct oidset_iter {
|
|
const kh_oid_set_t *set;
|
|
khiter_t iter;
|
|
};
|
|
|
|
static inline void oidset_iter_init(const struct oidset *set,
|
|
struct oidset_iter *iter)
|
|
{
|
|
iter->set = &set->set;
|
|
iter->iter = kh_begin(iter->set);
|
|
}
|
|
|
|
static inline struct object_id *oidset_iter_next(struct oidset_iter *iter)
|
|
{
|
|
for (; iter->iter != kh_end(iter->set); iter->iter++) {
|
|
if (kh_exist(iter->set, iter->iter))
|
|
return &kh_key(iter->set, iter->iter++);
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static inline struct object_id *oidset_iter_first(struct oidset *set,
|
|
struct oidset_iter *iter)
|
|
{
|
|
oidset_iter_init(set, iter);
|
|
return oidset_iter_next(iter);
|
|
}
|
|
|
|
#endif /* OIDSET_H */
|