summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-21 09:42:35 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-21 16:58:03 (GMT)
commitc3e7fbcbd0561cd13abc8cefcea3e09ab6090d50 (patch)
treeee4065e9e7607efef9451ee696be44333496bccc /diff-files.c
parent52e9578985fb636ec1d3f6cf794fdadd5ec896fc (diff)
downloadgit-c3e7fbcbd0561cd13abc8cefcea3e09ab6090d50.zip
git-c3e7fbcbd0561cd13abc8cefcea3e09ab6090d50.tar.gz
git-c3e7fbcbd0561cd13abc8cefcea3e09ab6090d50.tar.bz2
[PATCH] Diff overhaul, adding the other half of copy detection.
This patch extends diff-cache and diff-files to report the unmodified files to diff-core as well when -C (copy detection) is in effect, so that the unmodified files can also be used as the source candidates. The existing test t4003 has been extended to cover this case. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c
index d3b80a0..a3c523f 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
continue;
}
changed = ce_match_stat(ce, &st);
- if (!changed)
+ if (!changed && detect_rename < 2)
continue;
oldmode = ntohl(ce->ce_mode);