author | Junio C Hamano <junkio@cox.net> | |
Fri, 27 May 2005 22:55:55 +0000 (15:55 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sun, 29 May 2005 18:17:43 +0000 (11:17 -0700) | ||
commit | 15d061b435a7e3b6bead39df3889f4af78c4b00a | |
tree | e19d482170bad5d14e9b3c581432576bcca95149 | tree | snapshot |
parent | 367cec1c024c3849cb32eaac15884a4adfefe1de | commit | diff |
[PATCH] Fix the way diffcore-rename records unremoved source.
Earier version of diffcore-rename used to keep unmodified
filepair in its output so that the last stage of the processing
that tells renames from copies can make all of rename/copy to
copies. However this had a bad interaction with other diffcore
filters that wanted to run after diffcore-rename, in that such
unmodified filepair must be retained for proper distinction
between renames and copies to happen.
This patch fixes the problem by changing the way diffcore-rename
records the information needed to distinguish "all are copies"
case and "the last one is a rename" case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Earier version of diffcore-rename used to keep unmodified
filepair in its output so that the last stage of the processing
that tells renames from copies can make all of rename/copy to
copies. However this had a bad interaction with other diffcore
filters that wanted to run after diffcore-rename, in that such
unmodified filepair must be retained for proper distinction
between renames and copies to happen.
This patch fixes the problem by changing the way diffcore-rename
records the information needed to distinguish "all are copies"
case and "the last one is a rename" case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff.c | diff | blob | history | |
diffcore-rename.c | diff | blob | history | |
diffcore.h | diff | blob | history | |
t/t4007-rename-3.sh | [new file with mode: 0644] | blob |