summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-09 06:02:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-09 06:02:17 (GMT)
commitbb11eb31a2e7da7f878dd501d39f6877ec00eb7d (patch)
tree4522f1b81040585f03b586200340e8bf7586bf46
parent1c9f54417e22103a04c51293369a48b6d3386ac4 (diff)
parentaa9ea77de4fffd133b3da1d36a19fd0bd11ad368 (diff)
downloadgit-bb11eb31a2e7da7f878dd501d39f6877ec00eb7d.zip
git-bb11eb31a2e7da7f878dd501d39f6877ec00eb7d.tar.gz
git-bb11eb31a2e7da7f878dd501d39f6877ec00eb7d.tar.bz2
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
-rw-r--r--builtin-blame.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-blame.c b/builtin-blame.c
index 9b9f544..e462a6e 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2251,6 +2251,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;
@@ -2392,10 +2396,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, ".mailmap", NULL);
if (!incremental)