kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2009-04-02 12:14:37 -07:00
parent cb365a7a56 aa9ea77de4
commit 5ab2f7b2ce
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

@ -2263,6 +2263,10 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
parse_done: parse_done:
argc = parse_options_end(&ctx); 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) if (cmd_is_annotate)
output_option |= OUTPUT_ANNOTATE_COMPAT; output_option |= OUTPUT_ANNOTATE_COMPAT;


@ -2404,10 +2408,6 @@ parse_done:
sb.ent = ent; sb.ent = ent;
sb.path = path; 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); read_mailmap(&mailmap, NULL);


if (!incremental) if (!incremental)