diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-27 15:51:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 11:17:43 -0700 |
| commit | 847941fdd962d71a724d72b9f90389bae835d2c0 (patch) | |
| tree | 73a09846dfb0de4dbf14f38d5c8922eddc3c6f58 | |
| parent | 226406f693013ea3eadab258cb5fc9d8e83df916 (diff) | |
| download | git-847941fdd962d71a724d72b9f90389bae835d2c0.tar.gz git-847941fdd962d71a724d72b9f90389bae835d2c0.tar.xz | |
[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>
| -rw-r--r-- | diffcore-pathspec.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); |