Merge branch 'jk/uploadpack-packobjectshook-fix' into maint

diff --git a/revision.c b/revision.c
index de4dce600d00282655907e9014228791a352f813..e411802ebec37604a693993cb5e9f2df18dae895 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2133,7 +2133,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
                revs->limited = 1;
        } else if (!strcmp(arg, "--ignore-missing")) {
                revs->ignore_missing = 1;
-       } else if (!strcmp(arg, "--exclude-promisor-objects")) {
+       } else if (revs->allow_exclude_promisor_objects_opt &&
+                  !strcmp(arg, "--exclude-promisor-objects")) {
                if (fetch_if_missing)
                        BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
                revs->exclude_promisor_objects = 1;