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 /submodule.h | |
| parent | Thirteenth batch (diff) | |
| parent | submodule: port submodule subcommand 'summary' from shell to C (diff) | |
| download | git-bbdba3d88320cd99ae3425f31e4c20213a877cac.tar.gz git-bbdba3d88320cd99ae3425f31e4c20213a877cac.zip | |
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 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index 9ce85c03fe..4ac6e31cf1 100644 --- a/submodule.h +++ b/submodule.h @@ -69,7 +69,7 @@ int parse_submodule_update_strategy(const char *value, struct submodule_update_strategy *dst); const char *submodule_strategy_to_string(const struct submodule_update_strategy *s); void handle_ignore_submodules_arg(struct diff_options *, const char *); -void show_submodule_summary(struct diff_options *o, const char *path, +void show_submodule_diff_summary(struct diff_options *o, const char *path, struct object_id *one, struct object_id *two, unsigned dirty_submodule); void show_submodule_inline_diff(struct diff_options *o, const char *path, |