diff_setup_done(): return void

diff --git a/builtin/checkout.c b/builtin/checkout.c
index a76aa2a6fd6ad076f4d10e4f5227d24b31c063ca..fc581d8bbbea9e411ad61b2c207adfca498c3691 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -315,8 +315,7 @@ static void show_local_changes(struct object *head, struct diff_options *opts)
        init_revisions(&rev, NULL);
        rev.diffopt.flags = opts->flags;
        rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
-       if (diff_setup_done(&rev.diffopt) < 0)
-               die(_("diff_setup_done failed"));
+       diff_setup_done(&rev.diffopt);
        add_pending_object(&rev, head, NULL);
        run_diff_index(&rev, 0);
 }