X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.c;h=f8e3cbf1a652de273ee3a9b98c09eefc268f9977;hb=22c67ca88ec65c4f278e8c82b2d98f3bd025238b;hp=71696c5eee45af40024a7761f5470f4b3e39b6b9;hpb=a9ab586a5db015d200dfdadcf5876d62f15dd36c;p=git.git diff --git a/diff.c b/diff.c index 71696c5e..f8e3cbf1 100644 --- a/diff.c +++ b/diff.c @@ -955,7 +955,9 @@ static void diff_resolve_rename_copy(void) } /* See if there is some other filepair that * copies from the same source as us. If so - * we are a copy. Otherwise we are a rename. + * we are a copy. Otherwise we are either a + * copy if the path stays, or a rename if it + * does not, but we already handled "stays" case. */ for (j = i + 1; j < q->nr; j++) { pp = q->queue[j];