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

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

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/diff.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc diff-no-index.c
index 0b46a0f79f1376a935e4a0a408a224de711b60cb,b245ca8ad84732c8a5c9a227bd341b970ce8a62a..74da659368e4db67715a9c81dc7a5e0edcd3bcce
--- 1/diff-no-index.c
--- 2/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);

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc notes-merge.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc tree-diff.c
Simple merge