Merge branch 'js/diff-color-check'

diff --git a/builtin-blame.c b/builtin-blame.c
index 7a5665f093d7861fdab8a57f9f98c371210525b3..5669a169ff541a8ff7189ec95d907dcde248769e 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2203,6 +2203,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                        if (!strcmp(argv[j], "--"))
                                seen_dashdash = j;
                if (seen_dashdash) {
+                       /* (2) */
                        if (seen_dashdash + 1 != argc - 1)
                                usage(blame_usage);
                        path = add_prefix(prefix, argv[seen_dashdash + 1]);
@@ -2211,6 +2212,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                }
                else {
                        /* (3) */
+                       if (argc <= i)
+                               usage(blame_usage);
                        path = add_prefix(prefix, argv[i]);
                        if (i + 1 == argc - 1) {
                                final_commit_name = argv[i + 1];