On Tue, May 23, 2017 at 1:08 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> * sb/submodule-blanket-recursive (2017-05-23) 6 commits
> . builtin/push.c: respect 'submodule.recurse' option
> . builtin/grep.c: respect 'submodule.recurse' option
> . builtin/fetch.c: respect 'submodule.recurse' option
> . Introduce submodule.recurse option for worktree manipulators
> . submodule test invocation: only pass additional arguments
> . submodule.c: add has_submodules to check if we have any submodules
> (this branch uses sb/reset-recurse-submodules.)
>
> A new configuration variable "submodule.recurse" can be set to true
> to force various commands run at the top-level superproject to
> behave as if they were invoked with the "--recurse-submodules"
> option.
>
> Seems to break t7814 when merged to 'pu'.
I will investigate! (It passes on its own, so I guess it is some
interference with a recent grep series)
> * sb/diff-color-move (2017-05-23) 17 commits
> . diff.c: color moved lines differently
> . diff: buffer all output if asked to
> . diff.c: emit_line includes whitespace highlighting
> . diff.c: convert diff_summary to use emit_line_*
> . diff.c: convert diff_flush to use emit_line_*
> . diff.c: convert word diffing to use emit_line_*
> . diff.c: convert show_stats to use emit_line_*
> . diff.c: convert emit_binary_diff_body to use emit_line_*
> . submodule.c: convert show_submodule_summary to use emit_line_fmt
> . diff.c: convert emit_rewrite_lines to use emit_line_*
> . diff.c: convert emit_rewrite_diff to use emit_line_*
> . diff.c: convert builtin_diff to use emit_line_*
> . diff.c: convert fn_out_consume to use emit_line
> . diff: introduce more flexible emit function
> . diff.c: factor out diff_flush_patch_all_file_pairs
> . diff: move line ending check into emit_hunk_header
> . diff: readability fix
>
> "git diff" has been taught to optionally paint new lines that are
> the same as deleted lines elsewhere differently from genuinely new
> lines.
>
> Seems to break t4060 when merged to 'next'.
It breaks own its own, but when merged to next it breaks, too. :(
The reason for this is the submodule color thing that I added
last minute as manual inspection of submodule diffs seemed
odd to me.
It turns out submodule diffs were never colored appropriately,
so I'll resend with this interdiff (that let's test pass again),
once the discussion settles:
diff --git a/submodule.c b/submodule.c
index 428c996c97..19c63197fb 100644
--- a/submodule.c
+++ b/submodule.c
@@ -550,8 +550,6 @@ void show_submodule_inline_diff(struct
diff_options *o, const char *path,
/* TODO: other options may need to be passed here. */
argv_array_push(&cp.args, "diff");
- if (o->use_color)
- argv_array_push(&cp.args, "--color=always");
argv_array_pushf(&cp.args, "--line-prefix=%s", diff_line_prefix(o));
if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
argv_array_pushf(&cp.args, "--src-prefix=%s%s/",