summaryrefslogtreecommitdiff
path: root/oidset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:20 (GMT)
commit209f0755934a0c9b448408f9b7c9849c15041ecc (patch)
treeea04d9cd2847c3753c778b4dc5b976f37b19c910 /oidset.c
parentc62bff2cedead7df6fc55a745f073715da30727e (diff)
parent78fafbb2800915047ad2f1578c34ca19c316eca2 (diff)
downloadgit-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.c')
-rw-r--r--oidset.c35
1 files changed, 35 insertions, 0 deletions
diff --git a/oidset.c b/oidset.c
index 8bdecb1..f63ce81 100644
--- a/oidset.c
+++ b/oidset.c
@@ -35,3 +35,38 @@ 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);
+}