archive-zip: load userdiff config

diff --git a/submodule.c b/submodule.c
index e8258f061ac5726d8001a5b207886b3191745eaa..9d8d91c207e7a2c09bdf997ba05c67b1262d8091 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -370,11 +370,10 @@ void show_submodule_summary(FILE *f, const char *path,
                return;
        }
 
-       strbuf_addf(&sb, "%s%sSubmodule %s %s..", line_prefix, meta, path,
-                       find_unique_abbrev(one, DEFAULT_ABBREV));
-       if (!fast_backward && !fast_forward)
-               strbuf_addch(&sb, '.');
-       strbuf_addf(&sb, "%s", find_unique_abbrev(two, DEFAULT_ABBREV));
+       strbuf_addf(&sb, "%s%sSubmodule %s ", line_prefix, meta, path);
+       strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
+       strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
+       strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
        if (message)
                strbuf_addf(&sb, " %s%s\n", message, reset);
        else