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

* tr/void-diff-setup-done: diff_setup_done(): return void
2012-09-11 10:53:40 -07:00
parent 3f835949e9 28452655af
commit 738c218760
13 changed files with 16 additions and 32 deletions
--- a/builtin/diff.c
+++ b/builtin/diff.c
@ -302,8 +302,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	argc = setup_revisions(argc, argv, &rev, NULL);
 	if (!rev.diffopt.output_format) {
 		rev.diffopt.output_format = DIFF_FORMAT_PATCH;
-		if (diff_setup_done(&rev.diffopt) < 0)
-			die(_("diff_setup_done failed"));
+		diff_setup_done(&rev.diffopt);
 	}

 	DIFF_OPT_SET(&rev.diffopt, RECURSIVE);