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

* 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 9b9f5442a277082c8ad04295107eb9ddd6c95b19,0c241a9ec803a95ff85cf98f2714c74a6503b976..e462a6ec5037a9b33894990bcaf2b425273ba647
--- 1/builtin-blame.c
--- 2/builtin-blame.c
+++ b/builtin-blame.c
@@@ -2251,9 -2346,10 +2251,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);