From 5a5221427cb8b78c3246ffa305900db935017c54 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 4 May 2017 14:43:55 -0700 Subject: diff: recurse into nested submodules for inline diff When fd47ae6a5b (diff: teach diff to display submodule difference with an inline diff, 2016-08-31) was introduced, we did not think of recursing into nested submodules. When showing the inline diff for submodules, automatically recurse into nested submodules as well with inline submodule diffs. Signed-off-by: Stefan Beller Acked-by: Jacob Keller Signed-off-by: Junio C Hamano --- submodule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'submodule.c') diff --git a/submodule.c b/submodule.c index 5a62aa2960..be29b3471a 100644 --- a/submodule.c +++ b/submodule.c @@ -475,7 +475,8 @@ void show_submodule_inline_diff(FILE *f, const char *path, cp.no_stdin = 1; /* TODO: other options may need to be passed here. */ - argv_array_push(&cp.args, "diff"); + argv_array_pushl(&cp.args, "diff", "--submodule=diff", NULL); + argv_array_pushf(&cp.args, "--line-prefix=%s", line_prefix); if (DIFF_OPT_TST(o, REVERSE_DIFF)) { argv_array_pushf(&cp.args, "--src-prefix=%s%s/", -- cgit 1.2.3-korg