From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 17:53:40 +0000 (-0700)
Subject: Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
X-Git-Tag: v1.7.11.6~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=738c2187604756fea3901554a49f9137e02ed0ef;p=git.git

Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

* tr/void-diff-setup-done:
  diff_setup_done(): return void
---

738c2187604756fea3901554a49f9137e02ed0ef
diff --cc diff-no-index.c
index 0b46a0f79,b245ca8ad..74da65936
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@@ -258,13 -256,11 +258,12 @@@ void diff_no_index(struct rev_info *rev
  	DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
  
  	revs->max_count = -2;
- 	if (diff_setup_done(&revs->diffopt) < 0)
- 		die("diff_setup_done failed");
+ 	diff_setup_done(&revs->diffopt);
  
 -	if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
 -		       revs->diffopt.pathspec.raw[1]))
 +	setup_diff_pager(&revs->diffopt);
 +	DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
 +
 +	if (queue_diff(&revs->diffopt, paths[0], paths[1]))
  		exit(1);
  	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
  	diffcore_std(&revs->diffopt);