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.
This commit is contained in:
@ -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");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user