mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
[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>
This commit is contained in:
parent
226406f693
commit
847941fdd9
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue