From: Junio C Hamano Date: Fri, 27 May 2005 22:51:52 GMT Subject: [PATCH 03/12] Make pathspec only care about the detination tree. Message-ID: <7vzmug4707.fsf_-_@assigned-by-dhcp.cox.net> In-Reply-To: <7vk6lk5lxt.fsf_-_@assigned-by-dhcp.cox.net> 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 --- diffcore-pathspec.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c --- a/diffcore-pathspec.c +++ b/diffcore-pathspec.c @@ -55,8 +55,7 @@ void diffcore_pathspec(const char **path 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); ------------------------------------------------