Remove awkward compatibility warts

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 1958580d82e54ab5a5b1e054263eab7264c4bcb2..b37c9e8ccb30686810ecfdb898ad360b40ca0723 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -28,11 +28,14 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
                else
                        usage(diff_cache_usage);
        }
+       if (!rev.diffopt.output_format)
+               rev.diffopt.output_format = DIFF_FORMAT_RAW;
+
        /*
         * Make sure there is one revision (i.e. pending object),
         * and there is no revision filtering parameters.
         */
-       if (!rev.pending_objects || rev.pending_objects->next ||
+       if (rev.pending.nr != 1 ||
            rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
                usage(diff_cache_usage);
        return run_diff_index(&rev, cached);