git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Bo Yang <struggleyb.nku@gmail.com>
Cc: git@vger.kernel.org, torvalds@linux-foundation.org,
	trast@student.ethz.ch
Subject: Re: [PATCH] Make --follow support --find-copies-harder.
Date: Tue, 20 Apr 2010 20:05:52 -0700	[thread overview]
Message-ID: <7vtyr5cxnz.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1271762875-16548-1-git-send-email-struggleyb.nku@gmail.com> (Bo Yang's message of "Tue\, 20 Apr 2010 19\:27\:55 +0800")

Bo Yang <struggleyb.nku@gmail.com> writes:

> 'git diff --follow <commit1> <commit2> <path>' give users
> the content difference of <path> between the two commits.
> It will detect file copies/moves of <path> if there is any.

Because the "--follow" hack was done primarily as a "checkbox" item, and
also because it is not an option for the "diff" family (it is an option
for the "log" family), I would personally think that it is actually a bug
that "git diff" accepts "--follow" and pretends as if it is doing useful
work, but does so only some of the time.

    $ git diff --follow --name-status maint master -- builtin/log.c
    R089	builtin-log.c	builtin/log.c
    $ git diff --follow --name-status -R maint master -- builtin/log.c
    D	builtin/log.c
    $ git diff --follow --name-status master maint -- builtin/log.c
    D	builtin/log.c

As we can see, it doesn't quite work, and it is not a fault of 750f7b6
(Finally implement "git log --follow", 2007-06-19) by Linus, exactly
because the feature wasn't designed to work with "diff" to begin with.

If we were to add a support of "--follow" to "diff" family, I suspect that
we need to

 (1) make sure we get only one path, just like "log" family does;

 (2) add a logic to notice the reverse situation as demonstrated above and
     deal with it in a sensible way, without any --find-copies option
     given by the user.

among other things.  Also we of course need to document it as a new "diff"
option when we are done.

  reply	other threads:[~2010-04-21  3:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-20 11:27 [PATCH] Make --follow support --find-copies-harder Bo Yang
2010-04-21  3:05 ` Junio C Hamano [this message]
2010-04-21  4:17   ` Bo Yang
2010-04-21  9:02   ` Bo Yang
2010-04-21  9:24     ` Junio C Hamano

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=7vtyr5cxnz.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=struggleyb.nku@gmail.com \
    --cc=torvalds@linux-foundation.org \
    --cc=trast@student.ethz.ch \
    /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).