diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-17 06:29:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-17 06:29:32 (GMT) |
| commit | 1776a710d615c77e3c66be2f4a08c36663f88a07 (patch) | |
| tree | f19ebe6b05a8a73dcad416b30ca547cbbf0d8c5c /submodule.c | |
| parent | 263fd041a8cb575e18331f0af39f4481039eaf34 (diff) | |
| parent | 17b254cda6dd77b1a91ac6f2946943e52698efa9 (diff) | |
| download | git-1776a710d615c77e3c66be2f4a08c36663f88a07.zip git-1776a710d615c77e3c66be2f4a08c36663f88a07.tar.gz git-1776a710d615c77e3c66be2f4a08c36663f88a07.tar.bz2 | |
Merge branch 'sb/show-diff-for-submodule-in-diff-fix'
"git diff --submodule=diff" learned to work better in a project
with a submodule that in turn has its own submodules.
* sb/show-diff-for-submodule-in-diff-fix:
diff: submodule inline diff to initialize env array.
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c index 83b13b8..7c3c4b1 100644 --- a/submodule.c +++ b/submodule.c @@ -576,6 +576,7 @@ void show_submodule_inline_diff(FILE *f, const char *path, if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED)) argv_array_push(&cp.args, oid_to_hex(new)); + prepare_submodule_repo_env(&cp.env_array); if (run_command(&cp)) fprintf(f, "(diff failed)\n"); |