mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
bb11eb31a2
|
@ -2251,6 +2251,10 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
|
||||||
parse_done:
|
parse_done:
|
||||||
argc = parse_options_end(&ctx);
|
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)
|
if (cmd_is_annotate)
|
||||||
output_option |= OUTPUT_ANNOTATE_COMPAT;
|
output_option |= OUTPUT_ANNOTATE_COMPAT;
|
||||||
|
|
||||||
|
@ -2392,10 +2396,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
|
||||||
sb.ent = ent;
|
sb.ent = ent;
|
||||||
sb.path = path;
|
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, ".mailmap", NULL);
|
||||||
|
|
||||||
if (!incremental)
|
if (!incremental)
|
||||||
|
|
Loading…
Reference in a new issue