Merge branch 'jc/maint-1.6.0-blame-s' into maint

* jc/maint-1.6.0-blame-s:
  blame: read custom grafts given by -S before calling setup_revisions()

Conflicts:
	builtin-blame.c

diff --cc builtin-blame.c
index 114a214ed3fef40ae5cc13737d037f29d6f8acfd,0c241a9ec803a95ff85cf98f2714c74a6503b976..1ead9b48308feacfe253be060c32ec0210475a3d
--- 1/builtin-blame.c
--- 2/builtin-blame.c
+++ b/builtin-blame.c
@@@ -2263,9 -2346,10 +2263,13 @@@ int cmd_blame(int argc, const char **ar
  parse_done:
        argc = parse_options_end(&ctx);
  
+       if (revs_file && read_ancestry(revs_file))
+               die("reading graft file %s failed: %s",
+                   revs_file, strerror(errno));
+ 
 +      if (cmd_is_annotate)
 +              output_option |= OUTPUT_ANNOTATE_COMPAT;
 +
        if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
                opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
                        PICKAXE_BLAME_COPY_HARDER);
@@@ -2404,11 -2488,7 +2408,7 @@@
        sb.ent = ent;
        sb.path = path;
  
-       if (revs_file && read_ancestry(revs_file))
-               die("reading graft file %s failed: %s",
-                   revs_file, strerror(errno));
- 
 -      read_mailmap(&mailmap, ".mailmap", NULL);
 +      read_mailmap(&mailmap, NULL);
  
        if (!incremental)
                setup_pager();