From: Junio C Hamano Date: Fri, 27 May 2005 22:51:52 +0000 (-0700) Subject: [PATCH] Make pathspec only care about the detination tree. X-Git-Tag: v0.99~434 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=847941fdd962d71a724d72b9f90389bae835d2c0;p=git.git [PATCH] Make pathspec only care about the detination tree. Earlier it had a misguided attempt to include paths that matches either source tree or destination tree after the rename/copy detection. The new semantics will be that pathspec defines a narrowed down world the diffcore operates in, so it should not even look at where in the source tree the path came from. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c index c460b2e56..0392d66a5 100644 --- a/diffcore-pathspec.c +++ b/diffcore-pathspec.c @@ -55,8 +55,7 @@ void diffcore_pathspec(const char **pathspec) for (i = 0; i < q->nr; i++) { struct diff_filepair *p = q->queue[i]; - if (matches_pathspec(p->one->path, spec, speccnt) || - matches_pathspec(p->two->path, spec, speccnt)) + if (matches_pathspec(p->two->path, spec, speccnt)) diff_q(&outq, p); else diff_free_filepair(p);