Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1

diff --git a/builtin-rerere.c b/builtin-rerere.c
index dd4573fe8dcd9dc8edd5a7d41bc8daa83034ee7e..d4dec6b7156b081bf63933d4de6d0b62ab2212c8 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -98,6 +98,7 @@ static int diff_two(const char *file1, const char *label1,
 
        printf("--- a/%s\n+++ b/%s\n", label1, label2);
        fflush(stdout);
+       memset(&xpp, 0, sizeof(xpp));
        xpp.flags = XDF_NEED_MINIMAL;
        memset(&xecfg, 0, sizeof(xecfg));
        xecfg.ctxlen = 3;