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

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

 



Jeff King <peff@xxxxxxxx> writes:

> 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.

Perhaps.  Care to do the honors of rolling the final version perhaps with
a test?
--
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]