aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-26 00:28:22 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-26 00:28:22 -0700
commit3fcee259d023087184c63eedf1015be6e23ea6e1 (patch)
treeab734962b5eb4883ed269bb2785e67322c504ced
parent6422c6af38747f008ebffc106f9a5799b26091d0 (diff)
parentaa9ea77de4fffd133b3da1d36a19fd0bd11ad368 (diff)
downloadgit-3fcee259d023087184c63eedf1015be6e23ea6e1.tar.gz
git-3fcee259d023087184c63eedf1015be6e23ea6e1.tar.xz
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
-rw-r--r--builtin-blame.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-blame.c b/builtin-blame.c
index 2aedd17c3..83141fc84 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 @@ parse_done:
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)