git-merge: fix confusion between tag and branch

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index b5b13dee3b3a5fe5877762817af9de7dd22d5c4c..f1124e261b04ca93118c662f391dec41d9ee9713 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -298,9 +298,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
        if (!access(".mailmap", R_OK))
                read_mailmap(".mailmap");
 
-       if (rev.pending.nr == 1)
-               die ("Need a range!");
-       else if (rev.pending.nr == 0)
+       if (rev.pending.nr == 0)
                read_from_stdin(&list);
        else
                get_from_rev(&rev, &list);