git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/parse-options.c b/parse-options.c
index b32c9ea66c7ae1e83564cd25d63d5cfd6c1589b5..8e64316fe002fe90c58de61e4d6558ee4ad87157 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -259,6 +259,8 @@ int parse_options(int argc, const char **argv, const struct option *options,
                const char *arg = args.argv[0];
 
                if (*arg != '-' || !arg[1]) {
+                       if (flags & PARSE_OPT_STOP_AT_NON_OPTION)
+                               break;
                        args.out[args.cpidx++] = args.argv[0];
                        continue;
                }