Re: [PATCH] add -p: skip conflicted paths

[Jeff King <peff@peff.net>]

On Wed, Apr 04, 2012 at 11:29:21AM -0700, Junio C Hamano wrote:

> >> So combining the two patches, we have
> >> something like:
> >
> > Hrm.  I kind of liked the idea of doing this with a single plumbing call
> > to diff-files (the entries that come from --raw will be mostly discarded
> > except for the ones that are marked with "U"), though.
> 
> That is, something like this on top of your patch.

Ugh, I totally misread your original message and missed the fact that we
_could_ see what we wanted by adding "--raw". Sorry to be dense.

Yes, this is way better. I don't mind discarding the --raw entries that
are not used; they cost nothing to generate on top of what we are
already doing, so it is really just the cost of shuttling a few bytes
across the pipe.

> -	for (run_cmd_pipe(qw(git diff-files --numstat --summary --), @tracked)) {
> +	for (run_cmd_pipe(qw(git diff-files --numstat --summary),
> +			  ($note_unmerged ? ("--raw") : ()),
> +			  "--", @tracked)) {

Maybe it is not worth even having $note_unmerged, and just filling in
the UNMERGED field unconditionally? I know other callers don't care
about the information, but it's so cheap, and it just makes the function
interface that much simpler.

-Peff