Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / blame.c

diff --git a/blame.c b/blame.c
index 82fa16d6585b90e3635d87f6adc1e4856524f7d6..b475bfa1c042138671dd5fc82622e90c17504197 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -1184,6 +1184,7 @@ void blame_coalesce(struct blame_scoreboard *sb)
        for (ent = sb->ent; ent && (next = ent->next); ent = next) {
                if (ent->suspect == next->suspect &&
                    ent->s_lno + ent->num_lines == next->s_lno &&
+                   ent->lno + ent->num_lines == next->lno &&
                    ent->ignored == next->ignored &&
                    ent->unblamable == next->unblamable) {
                        ent->num_lines += next->num_lines;
@@ -1352,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)