mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 02:26:11 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2009-04-08 23:02:17 -07:00
parent 1c9f54417e aa9ea77de4
commit bb11eb31a2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-blame.c
View File

@ -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 @@ 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, ".mailmap", NULL);
if (!incremental)