Merge branch 'master' into jc/diff

* master:
  Make "--parents" logs also be incremental
  Retire diffcore-pathspec.
  Improve the git-diff-tree -c/-cc documentation

1 files changed, 0 insertions, 2 deletions

diff --git a/diff.c b/diff.c
index 30e4d50b95..2fa285a8ef 100644
--- a/diff.c
+++ b/diff.c
@@ -1375,8 +1375,6 @@ static void diffcore_apply_filter(const char *filter)
 
 void diffcore_std(struct diff_options *options)
 {
-	if (options->paths && options->paths[0])
-		diffcore_pathspec(options->paths);
 	if (options->break_opt != -1)
 		diffcore_break(options->break_opt);
 	if (options->detect_rename)