Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:28

Possibly related (same subject, not in this thread)

Jeff King [off-list ref] 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.
quoted
-	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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help