From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Mar 2009 07:28:22 +0000 (-0700)
Subject: Merge branch 'jc/maint-1.6.0-blame-s'
X-Git-Tag: v1.6.3-rc0~80
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3fcee259d023087184c63eedf1015be6e23ea6e1?hp=6422c6af38747f008ebffc106f9a5799b26091d0

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

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

Conflicts:
builtin-blame.c
---

diff --git a/builtin-blame.c b/builtin-blame.c
index 2aedd17c39..83141fc84e 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2250,6 +2250,10 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 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;
@@ -2418,10 +2422,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	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)