path: root/revision.c
diff options
authorMatthew DeVore <>2018-10-23 01:13:42 (GMT)
committerJunio C Hamano <>2018-10-23 04:52:57 (GMT)
commit669b1d2aaec73ba762bf566078308075886ca208 (patch)
tree221c7ff149683106450a6ba51e2b613c0bffae27 /revision.c
parent368a89124c3ad859631452f7b012d0ad939375f3 (diff)
exclude-promisor-objects: declare when option is allowed
The --exclude-promisor-objects option causes some funny behavior in at least two commands: log and blame. It causes a BUG crash: $ git log --exclude-promisor-objects BUG: revision.c:2143: exclude_promisor_objects can only be used when fetch_if_missing is 0 Aborted [134] Fix this such that the option is treated like any other unknown option. The commands that must support it are limited, so declare in those commands that the flag is supported. In particular: pack-objects prune rev-list The commands were found by searching for logic which parses --exclude-promisor-objects outside of revision.c. Extra logic outside of revision.c is needed because fetch_if_missing must be turned on before revision.c sees the option or it will BUG-crash. The above list is supported by the fact that no other command is introspectively invoked by another command passing --exclude-promisor-object. Signed-off-by: Matthew DeVore <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'revision.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index b42c836..748310c 100644
--- a/revision.c
+++ b/revision.c
@@ -2105,7 +2105,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)
die("BUG: exclude_promisor_objects can only be used when fetch_if_missing is 0");
revs->exclude_promisor_objects = 1;