]> git.ipfire.org Git - thirdparty/git.git/commit - diff.c
Make diffcore_std only can run once before a diff_flush
authorBo Yang <struggleyb.nku@gmail.com>
Fri, 7 May 2010 04:52:28 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2010 16:34:28 +0000 (09:34 -0700)
commit1da6175d438a9849db07a68326ee05f291510074
tree1c2cc5a775f5c8f153a7e27e6bbb84a80ef16401
parent9ca5df90615aa3c6b60e1bc8f03db6cae98e816c
Make diffcore_std only can run once before a diff_flush

When file renames/copies detection is turned on, the
second diffcore_std will degrade a 'C' pair to a 'R' pair.

And this may happen when we run 'git log --follow' with
hard copies finding. That is, the try_to_follow_renames()
will run diffcore_std to find the copies, and then
'git log' will issue another diffcore_std, which will reduce
'src->rename_used' and recognize this copy as a rename.
This is not what we want.

So, I think we really don't need to run diffcore_std more
than one time.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
diffcore.h