From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [RFC] use typechange as rename source
Date: Fri, 30 Nov 2007 22:13:13 -0800 [thread overview]
Message-ID: <7v8x4f6iyu.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vhcj36j6e.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Fri, 30 Nov 2007 22:08:41 -0800")
Junio C Hamano <gitster@pobox.com> 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.
next prev parent reply other threads:[~2007-12-01 6:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-21 17:12 [RFC] use typechange as rename source Jeff King
2007-11-29 0:02 ` Junio C Hamano
2007-11-29 14:14 ` Jeff King
2007-11-30 1:10 ` Junio C Hamano
2007-11-30 1:57 ` Jeff King
2007-12-01 2:36 ` Junio C Hamano
2007-12-01 4:34 ` Jeff King
2007-12-01 6:08 ` Junio C Hamano
2007-12-01 6:13 ` Junio C Hamano [this message]
2007-12-01 6:35 ` Junio C Hamano
2007-12-01 6:49 ` Jeff King
2007-12-02 19:15 ` Junio C Hamano
2007-12-03 1:20 ` Jeff King
2007-12-01 6:17 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v8x4f6iyu.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).