Merge branch 'maint'

diff --git a/builtin-blame.c b/builtin-blame.c
index 98e818ce6a63b352182b428b49464596d37a0617..10f7eacf6e881cdb54a6b4a4c0aafc5f9751e5a9 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2365,6 +2365,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                        die_errno("cannot stat path '%s'", path);
        }
 
+       revs.disable_stdin = 1;
        setup_revisions(argc, argv, &revs, NULL);
        memset(&sb, 0, sizeof(sb));
 
@@ -2432,7 +2433,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        if (top < 1)
                top = lno;
        bottom--;
-       if (lno < top)
+       if (lno < top || lno < bottom)
                die("file %s has only %lu lines", path, lno);
 
        ent = xcalloc(1, sizeof(*ent));