Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
blame: Fix path pruning
author
Fredrik Kuivinen
<freku045@student.liu.se>
Wed, 3 May 2006 21:28:46 +0000
(23:28 +0200)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 4 May 2006 00:09:36 +0000
(17:09 -0700)
This makes git-blame useable again, it has been totally broken for
some time on larger repositories.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
blame.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
095acb8
)
diff --git
a/blame.c
b/blame.c
index 07d2d272514bdf68adf756dcb111b47226fbd1d8..99ceea81df7b7c69bc263cf170cbb23d88420613 100644
(file)
--- a/
blame.c
+++ b/
blame.c
@@
-515,9
+515,9
@@
static int compare_tree_path(struct rev_info* revs,
paths[1] = NULL;
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
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);
ret = rev_compare_tree(revs, c1->tree, c2->tree);
- diff_tree_release_paths(&revs->
diffopt
);
+ diff_tree_release_paths(&revs->
pruning
);
return ret;
}
return ret;
}
@@
-531,9
+531,9
@@
static int same_tree_as_empty_path(struct rev_info *revs, struct tree* t1,
paths[1] = NULL;
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
paths[1] = NULL;
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
- &revs->
diffopt
);
+ &revs->
pruning
);
ret = rev_same_tree_as_empty(revs, t1);
ret = rev_same_tree_as_empty(revs, t1);
- diff_tree_release_paths(&revs->
diffopt
);
+ diff_tree_release_paths(&revs->
pruning
);
return ret;
}
return ret;
}
@@
-834,7
+834,7
@@
int main(int argc, const char **argv)
args[0] = filename;
args[1] = NULL;
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);
prepare_revision_walk(&rev);
process_commits(&rev, filename, &initial);