diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-02 23:14:37 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-02 23:14:37 +0400 |
| commit | 5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005 (patch) | |
| tree | 1888b316163a5c96efc874a3d8f40b219a2af0e0 | |
| parent | cb365a7a564152662e3f9c5b9a92e37aaf726ed9 (diff) | |
| parent | aa9ea77de4fffd133b3da1d36a19fd0bd11ad368 (diff) | |
Merge branch 'jc/maint-1.6.0-blame-s' into maint
* 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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 114a214ed3..1ead9b4830 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2263,6 +2263,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; @@ -2404,10 +2408,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) |