From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Apr 2009 06:02:17 +0000 (-0700)
Subject: Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
X-Git-Tag: v1.6.2.3~1^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bb11eb31a2e7da7f878dd501d39f6877ec00eb7d;p=git.git

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
---

bb11eb31a2e7da7f878dd501d39f6877ec00eb7d
diff --cc builtin-blame.c
index 9b9f5442a,0c241a9ec..e462a6ec5
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@@ -2251,9 -2346,10 +2251,13 @@@ int cmd_blame(int argc, const char **ar
  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;
 +
  	if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
  		opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
  			PICKAXE_BLAME_COPY_HARDER);