Merge branch 'jk/patch-ids-no-merges' into maint

diff --git a/builtin/blame.c b/builtin/blame.c
index 7ec782343002d27b1b7fdd7e61fada12e81eeaf1..a5bbf91e497524215c884f1e145070afcf3f586a 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2244,7 +2244,8 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
        pos = cache_name_pos(path, strlen(path));
        if (pos >= 0)
                ; /* path is in the index */
-       else if (!strcmp(active_cache[-1 - pos]->name, path))
+       else if (-1 - pos < active_nr &&
+                !strcmp(active_cache[-1 - pos]->name, path))
                ; /* path is in the index, unmerged */
        else
                die("no such path '%s' in HEAD", path);