push: fix segfault for odd config

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 20b34ce6e10d9b863226b501cf5a35178b898995..c315f63398bac5dd3fd465af881caa5f3b9c9184 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -295,6 +295,8 @@ static void show_local_changes(struct object *head)
        init_revisions(&rev, NULL);
        rev.abbrev = 0;
        rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
+       if (diff_setup_done(&rev.diffopt) < 0)
+               die("diff_setup_done failed");
        add_pending_object(&rev, head, NULL);
        run_diff_index(&rev, 0);
 }