Merge branch 'maint-1.6.0' into maint

diff --git a/submodule.c b/submodule.c
index 461faf0e000ee14cdd0bb3d40121e1d21833e30d..86aad653b7c113106e365a9d4e4c38b3e7737457 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -38,7 +38,7 @@ void show_submodule_summary(FILE *f, const char *path,
                const char *del, const char *add, const char *reset)
 {
        struct rev_info rev;
-       struct commit *commit, *left = left, *right;
+       struct commit *commit, *left = left, *right = right;
        struct commit_list *merge_bases, *list;
        const char *message = NULL;
        struct strbuf sb = STRBUF_INIT;