diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-09-09 13:53:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-09 13:53:05 -0700 |
commit | bbdba3d88320cd99ae3425f31e4c20213a877cac (patch) | |
tree | 2ff71745c554727bbb0583198ad9489889ceee87 /diff.c | |
parent | 3a238e539bcdfe3f9eb5010fd218640c1b499f7a (diff) | |
parent | e83e3333b5770815e9c2e3aee48c305257385bbb (diff) | |
download | git-bbdba3d88320cd99ae3425f31e4c20213a877cac.tar.gz |
Merge branch 'ss/submodule-summary-in-c'
Yet another subcommand of "git submodule" is getting rewritten in C.
* ss/submodule-summary-in-c:
submodule: port submodule subcommand 'summary' from shell to C
t7421: introduce a test script for verifying 'summary' output
submodule: rename helper functions to avoid ambiguity
submodule: remove extra line feeds between callback struct and macro
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3432,7 +3432,7 @@ static void builtin_diff(const char *name_a, if (o->submodule_format == DIFF_SUBMODULE_LOG && (!one->mode || S_ISGITLINK(one->mode)) && (!two->mode || S_ISGITLINK(two->mode))) { - show_submodule_summary(o, one->path ? one->path : two->path, + show_submodule_diff_summary(o, one->path ? one->path : two->path, &one->oid, &two->oid, two->dirty_submodule); return; |