diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:42 +0900 |
| commit | a531ecf399a5d2ddb97dbd79bbcdad2dd93e7268 (patch) | |
| tree | a6052ef0b98bb1c4c1a8c171e69d1d4f7507a1da /submodule.c | |
| parent | 4eeed27e16c71ceecdf5a2d51af4099bb12ff775 (diff) | |
| parent | 5a5221427cb8b78c3246ffa305900db935017c54 (diff) | |
| download | git-a531ecf399a5d2ddb97dbd79bbcdad2dd93e7268.tar.gz | |
Merge branch 'jk/diff-submodule-diff-inline'
"git diff --submodule=diff" now recurses into nested submodules.
* jk/diff-submodule-diff-inline:
diff: recurse into nested submodules for inline diff
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 268f25fc2c..5bb7e7a033 100644 --- a/submodule.c +++ b/submodule.c @@ -554,7 +554,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/", |