config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag

[thirdparty/git.git] / blame.c

diff --git a/blame.c b/blame.c
index 1be1cd82a29b781e6761f7281d8a8c3df89a0535..686845b2b43dffe35d9f9811b61c80a0e0536332 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -1276,7 +1276,7 @@ static int maybe_changed_path(struct repository *r,
        if (commit_graph_generation(origin->commit) == GENERATION_NUMBER_INFINITY)
                return 1;
 
-       filter = get_bloom_filter(r, origin->commit, 0);
+       filter = get_bloom_filter(r, origin->commit);
 
        if (!filter)
                return 1;
@@ -1353,8 +1353,8 @@ static struct blame_origin *find_origin(struct repository *r,
        else {
                int compute_diff = 1;
                if (origin->commit->parents &&
-                   !oidcmp(&parent->object.oid,
-                           &origin->commit->parents->item->object.oid))
+                   oideq(&parent->object.oid,
+                         &origin->commit->parents->item->object.oid))
                        compute_diff = maybe_changed_path(r, origin, bd);
 
                if (compute_diff)
@@ -2892,16 +2892,18 @@ void setup_blame_bloom_data(struct blame_scoreboard *sb,
                            const char *path)
 {
        struct blame_bloom_data *bd;
+       struct bloom_filter_settings *bs;
 
        if (!sb->repo->objects->commit_graph)
                return;
 
-       if (!sb->repo->objects->commit_graph->bloom_filter_settings)
+       bs = get_bloom_filter_settings(sb->repo);
+       if (!bs)
                return;
 
        bd = xmalloc(sizeof(struct blame_bloom_data));
 
-       bd->settings = sb->repo->objects->commit_graph->bloom_filter_settings;
+       bd->settings = bs;
 
        bd->alloc = 4;
        bd->nr = 0;