mirror of
https://github.com/git/git.git
synced 2024-11-30 21:44:02 +08:00
209f075593
"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()
73 lines
1.6 KiB
C
73 lines
1.6 KiB
C
#include "cache.h"
|
|
#include "oidset.h"
|
|
|
|
void oidset_init(struct oidset *set, size_t initial_size)
|
|
{
|
|
memset(&set->set, 0, sizeof(set->set));
|
|
if (initial_size)
|
|
kh_resize_oid_set(&set->set, initial_size);
|
|
}
|
|
|
|
int oidset_contains(const struct oidset *set, const struct object_id *oid)
|
|
{
|
|
khiter_t pos = kh_get_oid_set(&set->set, *oid);
|
|
return pos != kh_end(&set->set);
|
|
}
|
|
|
|
int oidset_insert(struct oidset *set, const struct object_id *oid)
|
|
{
|
|
int added;
|
|
kh_put_oid_set(&set->set, *oid, &added);
|
|
return !added;
|
|
}
|
|
|
|
int oidset_remove(struct oidset *set, const struct object_id *oid)
|
|
{
|
|
khiter_t pos = kh_get_oid_set(&set->set, *oid);
|
|
if (pos == kh_end(&set->set))
|
|
return 0;
|
|
kh_del_oid_set(&set->set, pos);
|
|
return 1;
|
|
}
|
|
|
|
void oidset_clear(struct oidset *set)
|
|
{
|
|
kh_release_oid_set(&set->set);
|
|
oidset_init(set, 0);
|
|
}
|
|
|
|
void oidset_parse_file(struct oidset *set, const char *path)
|
|
{
|
|
FILE *fp;
|
|
struct strbuf sb = STRBUF_INIT;
|
|
struct object_id oid;
|
|
|
|
fp = fopen(path, "r");
|
|
if (!fp)
|
|
die("could not open object name list: %s", path);
|
|
while (!strbuf_getline(&sb, fp)) {
|
|
const char *p;
|
|
const char *name;
|
|
|
|
/*
|
|
* Allow trailing comments, leading whitespace
|
|
* (including before commits), and empty or whitespace
|
|
* only lines.
|
|
*/
|
|
name = strchr(sb.buf, '#');
|
|
if (name)
|
|
strbuf_setlen(&sb, name - sb.buf);
|
|
strbuf_trim(&sb);
|
|
if (!sb.len)
|
|
continue;
|
|
|
|
if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
|
|
die("invalid object name: %s", sb.buf);
|
|
oidset_insert(set, &oid);
|
|
}
|
|
if (ferror(fp))
|
|
die_errno("Could not read '%s'", path);
|
|
fclose(fp);
|
|
strbuf_release(&sb);
|
|
}
|