[PATCH] blame: Fix path pruning
From: Fredrik Kuivinen <hidden>
Date: 2016-06-15 22:42:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
This makes git-blame useable again, it has been totally broken for some time on larger repositories. Signed-off-by: Fredrik Kuivinen <redacted> --- blame.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/blame.c b/blame.c
index 07d2d27..99ceea8 100644
--- a/blame.c
+++ b/blame.c@@ -515,9 +515,9 @@ static int compare_tree_path(struct rev_ paths[1] = NULL; diff_tree_setup_paths(get_pathspec(revs->prefix, paths), - &revs->diffopt); + &revs->pruning); ret = rev_compare_tree(revs, c1->tree, c2->tree); - diff_tree_release_paths(&revs->diffopt); + diff_tree_release_paths(&revs->pruning); return ret; }
@@ -531,9 +531,9 @@ static int same_tree_as_empty_path(struc paths[1] = NULL; diff_tree_setup_paths(get_pathspec(revs->prefix, paths), - &revs->diffopt); + &revs->pruning); ret = rev_same_tree_as_empty(revs, t1); - diff_tree_release_paths(&revs->diffopt); + diff_tree_release_paths(&revs->pruning); return ret; }
@@ -834,7 +834,7 @@ int main(int argc, const char **argv) args[0] = filename; args[1] = NULL; - diff_tree_setup_paths(args, &rev.diffopt); + diff_tree_setup_paths(args, &rev.pruning); prepare_revision_walk(&rev); process_commits(&rev, filename, &initial);