summaryrefslogtreecommitdiff
path: root/diffcore-pathspec.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-27 22:51:52 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-29 18:17:43 (GMT)
commit847941fdd962d71a724d72b9f90389bae835d2c0 (patch)
tree73a09846dfb0de4dbf14f38d5c8922eddc3c6f58 /diffcore-pathspec.c
parent226406f693013ea3eadab258cb5fc9d8e83df916 (diff)
downloadgit-847941fdd962d71a724d72b9f90389bae835d2c0.zip
git-847941fdd962d71a724d72b9f90389bae835d2c0.tar.gz
git-847941fdd962d71a724d72b9f90389bae835d2c0.tar.bz2
[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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diffcore-pathspec.c')
-rw-r--r--diffcore-pathspec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index c460b2e..0392d66 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);