From: Bo Yang Date: Wed, 21 Apr 2010 09:02:24 GMT Subject: Re: [PATCH] Make --follow support --find-copies-harder. Message-ID: In-Reply-To: <7vtyr5cxnz.fsf@alter.siamese.dyndns.org> On Wed, Apr 21, 2010 at 11:05 AM, Junio C Hamano wrote: > > 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 I am really wondering, when -R is used, how the file rename/copy should defined? Now, I can make -R works with --follow, and it produce something like: byang@byang-laptop:~/git/git$ ./git diff --follow --name-status maint master -- builtin/log.c R089 builtin-log.c builtin/log.c byang@byang-laptop:~/git/git$ ./git diff --follow --name-status -R maint master -- builtin/log.c R089 builtin/log.c builtin-log.c byang@byang-laptop:~/git/git$ ./git diff --follow --name-status master maint -- builtin/log.c D builtin/log.c byang@byang-laptop:~/git/git$ ./git diff --follow --name-status -R master maint -- builtin/log.c A builtin/log.c The problem is whether it make sense to say 'builtin/log.c renamed to builtin-log.c' when -R is given? Regards! Bo