Merge branch 'sp/fix-smart-http-deadlock-on-error'

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 95c59fa686de7c8a90ce935aecc35bc83c68076d..a5a1c86e92720e8beefd8275acfc5df2dbdce175 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -408,7 +408,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
        memset(opts + onb, 0, sizeof(opts[onb]));
        argc = parse_options(argc, argv, prefix, opts, usage,
                        (keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0) |
-                       (stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0));
+                       (stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0) |
+                       PARSE_OPT_SHELL_EVAL);
 
        strbuf_addf(&parsed, " --");
        sq_quote_argv(&parsed, argv, 0);