am: suppress apply errors when using 3-way

diff --git a/hash-object.c b/hash-object.c
index ebb3bedb074202a29e2356845012bd1ffae0dc19..47cf43c3cdd2bcd7638360a130fc8ef04ce132e9 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
@@ -84,7 +84,8 @@ int main(int argc, const char **argv)
 
        git_extract_argv0_path(argv[0]);
 
-       argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0);
+       argc = parse_options(argc, argv, NULL, hash_object_options,
+                            hash_object_usage, 0);
 
        if (write_object) {
                prefix = setup_git_directory();