author | Junio C Hamano <junkio@cox.net> | |
Sat, 10 Sep 2005 19:42:32 +0000 (12:42 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 10 Sep 2005 19:42:32 +0000 (12:42 -0700) | ||
commit | 6bac10d89d0889118a3e747c9c9210fd437c140d | |
tree | ad08af5231936eb82459b645f6b804b18d1a9d61 | tree | snapshot |
parent | b779d5f009f8e12df13d650ad8a57e63068a9c82 | commit | diff |
Fix copy marking from diffcore-rename.
When (A,B) ==> (B,C) rename-copy was detected, we incorrectly said
that C was created by copying B. This is because we only check if the
path of rename/copy source still exists in the resulting tree to see
if the file is renamed out of existence. In this case, the new B is
created by copying or renaming A, so the original B is lost and we
should say C is a rename of B not a copy of B.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When (A,B) ==> (B,C) rename-copy was detected, we incorrectly said
that C was created by copying B. This is because we only check if the
path of rename/copy source still exists in the resulting tree to see
if the file is renamed out of existence. In this case, the new B is
created by copying or renaming A, so the original B is lost and we
should say C is a rename of B not a copy of B.
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff.c | diff | blob | history | |
diffcore-rename.c | diff | blob | history |