Merge branch 'bw/push-options-recursively-to-submodules' into next

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 041b7898c4a47cb8ca4f61b1f3ebdc87152e72e9..2bd28d3c085c9f7f86072bb7e1aae443aee745e6 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -702,7 +702,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
                        }
                        if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) {
                                quiet = 1;
-                               flags |= GET_SHA1_QUIETLY;
+                               flags |= GET_OID_QUIETLY;
                                continue;
                        }
                        if (opt_with_value(arg, "--short", &arg)) {