Junio C Hamano <gitster@xxxxxxxxx> writes: > diff --git a/diffcore-break.c b/diffcore-break.c > index c71a226..69afc07 100644 > --- a/diffcore-break.c > +++ b/diffcore-break.c > @@ -52,8 +52,8 @@ static int should_break(struct diff_filespec *src, > * is the default. > */ > > - if (!S_ISREG(src->mode) || !S_ISREG(dst->mode)) > - return 0; /* leave symlink rename alone */ > + if (object_type(src->mode) != object_type(dst->mode)) > + return 1; /* even their types are different */ Oops, this part is wrong. It should be checking ISREG and stuff. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
