git-shortlog: fix common repository prefix abbreviation.

The code to abbreviate the common repository prefix was totally
borked.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index b760b477ea40e7826982f3578ea17c49dd32492e..bdd952c2524140f35f788f5e0cd906c3b390dbe4 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -130,12 +130,17 @@ static void insert_author_oneline(struct path_list *list,
        memcpy(buffer, oneline, onelinelen);
        buffer[onelinelen] = '\0';
 
        memcpy(buffer, oneline, onelinelen);
        buffer[onelinelen] = '\0';
 

-       while ((p = strstr(buffer, dot3)) != NULL) {
-               memcpy(p, "...", 3);
-               strcpy(p + 2, p + sizeof(dot3) - 1);
+       if (dot3) {
+               int dot3len = strlen(dot3);
+               if (dot3len > 5) {
+                       while ((p = strstr(buffer, dot3)) != NULL) {
+                               int taillen = strlen(p) - dot3len;
+                               memcpy(p, "/.../", 5);
+                               memmove(p + 5, p + dot3len, taillen + 1);
+                       }
+               }

        }
 
        }
 

-

        onelines = item->util;
        if (onelines->nr >= onelines->alloc) {
                onelines->alloc = alloc_nr(onelines->nr);
        onelines = item->util;
        if (onelines->nr >= onelines->alloc) {
                onelines->alloc = alloc_nr(onelines->nr);