diff options
Diffstat (limited to 'blame.c')
-rw-r--r-- | blame.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -553,10 +553,10 @@ static struct blame_origin *find_origin(struct commit *parent, diff_setup_done(&diff_opts); if (is_null_oid(&origin->commit->object.oid)) - do_diff_cache(&parent->tree->object.oid, &diff_opts); + do_diff_cache(&parent->maybe_tree->object.oid, &diff_opts); else - diff_tree_oid(&parent->tree->object.oid, - &origin->commit->tree->object.oid, + diff_tree_oid(&parent->maybe_tree->object.oid, + &origin->commit->maybe_tree->object.oid, "", &diff_opts); diffcore_std(&diff_opts); @@ -622,10 +622,10 @@ static struct blame_origin *find_rename(struct commit *parent, diff_setup_done(&diff_opts); if (is_null_oid(&origin->commit->object.oid)) - do_diff_cache(&parent->tree->object.oid, &diff_opts); + do_diff_cache(&parent->maybe_tree->object.oid, &diff_opts); else - diff_tree_oid(&parent->tree->object.oid, - &origin->commit->tree->object.oid, + diff_tree_oid(&parent->maybe_tree->object.oid, + &origin->commit->maybe_tree->object.oid, "", &diff_opts); diffcore_std(&diff_opts); @@ -1257,10 +1257,10 @@ static void find_copy_in_parent(struct blame_scoreboard *sb, diff_opts.flags.find_copies_harder = 1; if (is_null_oid(&target->commit->object.oid)) - do_diff_cache(&parent->tree->object.oid, &diff_opts); + do_diff_cache(&parent->maybe_tree->object.oid, &diff_opts); else - diff_tree_oid(&parent->tree->object.oid, - &target->commit->tree->object.oid, + diff_tree_oid(&parent->maybe_tree->object.oid, + &target->commit->maybe_tree->object.oid, "", &diff_opts); if (!diff_opts.flags.find_copies_harder) |