mirror of
https://github.com/git/git.git
synced 2024-05-08 06:16:15 +02:00
c714d05875
Since 610e2b9240 (blame: validate and peel the object names on the
ignore list, 2020-09-24) git blame reports checks if objects specified
with --ignore-rev and in files loaded with --ignore-revs-file and config
option blame.ignoreRevsFile are actual objects and dies if they aren't.
The intent is to report typos to the user.
This also breaks the ability to use a single ignore file for multiple
repositories. Typos are presumably less likely in files than on the
command line, so alerting is less useful here. Restore that feature by
skipping non-commits without dying.
Reported-by: Jean-Yves Avenard <jyavenard@mozilla.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Reviewed-by: Barret Rhoden <brho@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
86 lines
1.8 KiB
C
86 lines
1.8 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);
|
|
}
|
|
|
|
int oidset_size(struct oidset *set)
|
|
{
|
|
return kh_size(&set->set);
|
|
}
|
|
|
|
void oidset_parse_file(struct oidset *set, const char *path)
|
|
{
|
|
oidset_parse_file_carefully(set, path, NULL, NULL);
|
|
}
|
|
|
|
void oidset_parse_file_carefully(struct oidset *set, const char *path,
|
|
oidset_parse_tweak_fn fn, void *cbdata)
|
|
{
|
|
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);
|
|
if (fn && fn(&oid, cbdata))
|
|
continue;
|
|
oidset_insert(set, &oid);
|
|
}
|
|
if (ferror(fp))
|
|
die_errno("Could not read '%s'", path);
|
|
fclose(fp);
|
|
strbuf_release(&sb);
|
|
}
|