diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:20 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:20 (GMT) |
commit | 209f0755934a0c9b448408f9b7c9849c15041ecc (patch) | |
tree | ea04d9cd2847c3753c778b4dc5b976f37b19c910 /oidset.h | |
parent | c62bff2cedead7df6fc55a745f073715da30727e (diff) | |
parent | 78fafbb2800915047ad2f1578c34ca19c316eca2 (diff) | |
download | git-209f0755934a0c9b448408f9b7c9849c15041ecc.zip git-209f0755934a0c9b448408f9b7c9849c15041ecc.tar.gz git-209f0755934a0c9b448408f9b7c9849c15041ecc.tar.bz2 |
Merge branch 'br/blame-ignore'
"git blame" learned to "ignore" commits in the history, whose
effects (as well as their presence) get ignored.
* br/blame-ignore:
t8014: remove unnecessary braces
blame: drop some unused function parameters
blame: add a test to cover blame_coalesce()
blame: use the fingerprint heuristic to match ignored lines
blame: add a fingerprint heuristic to match ignored lines
blame: optionally track line fingerprints during fill_blame_origin()
blame: add config options for the output of ignored or unblamable lines
blame: add the ability to ignore commits and their changes
blame: use a helper function in blame_chunk()
Move oidset_parse_file() to oidset.c
fsck: rename and touch up init_skiplist()
Diffstat (limited to 'oidset.h')
-rw-r--r-- | oidset.h | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -61,6 +61,14 @@ int oidset_remove(struct oidset *set, const struct object_id *oid); */ 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); + struct oidset_iter { kh_oid_set_t *set; khiter_t iter; |