builtin git-shortlog is broken

Another small patch to fix the output result to be conform with the
perl version.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index 1456e1a1914c0a5a0f0009ef391066d1d67d5280..b760b477ea40e7826982f3578ea17c49dd32492e 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -7,7 +7,7 @@
 #include <string.h>
 
 static const char shortlog_usage[] =
 #include <string.h>
 
 static const char shortlog_usage[] =

-"git-shortlog [-n] [-s] [<commit-id>... ]\n";
+"git-shortlog [-n] [-s] [<commit-id>... ]";

 
 static int compare_by_number(const void *a1, const void *a2)
 {
 
 static int compare_by_number(const void *a1, const void *a2)
 {


@@ -287,8 +287,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
        for (i = 0; i < list.nr; i++) {
                struct path_list *onelines = list.items[i].util;
 
        for (i = 0; i < list.nr; i++) {
                struct path_list *onelines = list.items[i].util;
 

-               printf("%s (%d):\n", list.items[i].path, onelines->nr);
-               if (!summary) {
+               if (summary) {
+                       printf("%s: %d\n", list.items[i].path, onelines->nr);
+               } else {
+                       printf("%s (%d):\n", list.items[i].path, onelines->nr);

                        for (j = onelines->nr - 1; j >= 0; j--)
                                printf("      %s\n", onelines->items[j].path);
                        printf("\n");
                        for (j = onelines->nr - 1; j >= 0; j--)
                                printf("      %s\n", onelines->items[j].path);
                        printf("\n");