Merge branch 'maint-1.6.5' into maint-1.6.6

diff --git a/diff.c b/diff.c
index 6da52e0c49bc5646594ab47cba3971fd156e021d..7a321f4254cf25101f9c9ed5df1621e3bf4b2e29 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2855,6 +2855,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
                ;
        else if (!prefixcmp(arg, "--output=")) {
                options->file = fopen(arg + strlen("--output="), "w");
+               if (!options->file)
+                       die_errno("Could not open '%s'", arg + strlen("--output="));
                options->close_file = 1;
        } else
                return 0;