Sync with 1.7.11.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-09-11 11:23:45 -07:00
parent 3119084104 e09e4024a0
commit 1c88a6d174
32 changed files with 585 additions and 408 deletions
--- a/revision.c
+++ b/revision.c
@ -1863,8 +1863,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	if (revs->combine_merges)
 		revs->ignore_merges = 0;
 	revs->diffopt.abbrev = revs->abbrev;
-	if (diff_setup_done(&revs->diffopt) < 0)
-		die("diff_setup_done failed");
+	diff_setup_done(&revs->diffopt);

 	compile_grep_patterns(&revs->grep_filter);