Re: [PATCH 8/9 v13] difftool: teach difftool to handle directory diffs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Tim Henigan <tim.henigan@xxxxxxxxx> writes:

> So now we must decide how to handle deal with this use case.  It seems
> there are two options:
>
> 1) Append '--no-renames' to the end of the 'git diff --raw' argument
> list.  This will override any '-C' or '-M' settings.  This is a simple
> solution, but it loses some information about copies and renames.

Or not use Porcelain "git diff", but use the plumbing "git diff-index" or
"git diff-files" so that you won't get bitten by such end user settings.

In either case, this "feature", by feeding two entire trees to an external
program, makes it the responsibility of that external program to match up
files in these two trees, so we shouldn't be doing rename detection
ourselves at all.
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]