Merge branch 'maint'

[git.git] / builtin / grep.c

diff --git a/builtin/grep.c b/builtin/grep.c
index 597f76bc42f51e0fc1906c287981e3d37dc0f536..b725ede0f7270637759b9fef52ab5450fc1712e2 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -834,9 +834,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        int external_grep_allowed__ignored;
        const char *show_in_pager = NULL, *default_pager = "dummy";
        struct grep_opt opt;
-       struct object_array list = { 0, 0, NULL };
+       struct object_array list = OBJECT_ARRAY_INIT;
        const char **paths = NULL;
-       struct string_list path_list = { NULL, 0, 0, 0 };
+       struct string_list path_list = STRING_LIST_INIT_NODUP;
        int i;
        int dummy;
        int nongit = 0, use_index = 1;