Merge branch 'jc/apply-trailing-blank-removal'

diff --git a/submodule.h b/submodule.h
index f2e8271fc68c3b1e78d200e2af374a77f253f1ee..3dc1b3fe891eaf5c758ee0a668f9f385ea99d5ba 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -20,7 +20,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
 void show_submodule_summary(FILE *f, const char *path,
                unsigned char one[20], unsigned char two[20],
-               unsigned dirty_submodule,
+               unsigned dirty_submodule, const char *meta,
                const char *del, const char *add, const char *reset);
 void set_config_fetch_recurse_submodules(int value);
 void check_for_new_submodule_commits(unsigned char new_sha1[20]);