author | Junio C Hamano <gitster@pobox.com> | |
Thu, 26 Mar 2009 07:28:22 +0000 (00:28 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 26 Mar 2009 07:28:22 +0000 (00:28 -0700) |
* jc/maint-1.6.0-blame-s:
blame: read custom grafts given by -S before calling setup_revisions()
Conflicts:
builtin-blame.c
blame: read custom grafts given by -S before calling setup_revisions()
Conflicts:
builtin-blame.c
builtin-blame.c | patch | blob | history |
diff --git a/builtin-blame.c b/builtin-blame.c
index 2aedd17c39fdfa12b72551d61af559f534dd65a7..83141fc84e22ad4852f255fa1ad453cc125a3255 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
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;
blame_date_mode = DATE_ISO8601;
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, NULL);
if (!incremental)