diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:52 +0300 |
| commit | b52ac60bc461a16076209a3027bb15f7c890f148 (patch) | |
| tree | f16de68f0513127fff42a457a9ff56a3f0f37132 /builtin | |
| parent | d0975a0724cc8f0f88931264b8b97c8a4c428dda (diff) | |
| parent | 669b1d2aaec73ba762bf566078308075886ca208 (diff) | |
Merge branch 'md/exclude-promisor-objects-fix' into maint
Operations on promisor objects make sense in the context of only a
small subset of the commands that internally use the revisions
machinery, but the "--exclude-promisor-objects" option were taken
and led to nonsense results by commands like "log", to which it
didn't make much sense. This has been corrected.
* md/exclude-promisor-objects-fix:
exclude-promisor-objects: declare when option is allowed
Documentation/git-log.txt: do not show --exclude-promisor-objects
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 1 | ||||
| -rw-r--r-- | builtin/prune.c | 1 | ||||
| -rw-r--r-- | builtin/rev-list.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 29d48f3867..ad3c650c08 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2990,6 +2990,7 @@ static void get_object_list(int ac, const char **av) init_revisions(&revs, NULL); save_commit_buffer = 0; + revs.allow_exclude_promisor_objects_opt = 1; setup_revisions(ac, av, &revs, NULL); /* make sure shallows are read */ diff --git a/builtin/prune.c b/builtin/prune.c index b29ce4abbc..d356ad70f6 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -120,6 +120,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) save_commit_buffer = 0; read_replace_refs = 0; ref_paranoia = 1; + revs.allow_exclude_promisor_objects_opt = 1; init_revisions(&revs, prefix); argc = parse_options(argc, argv, prefix, options, prune_usage, 0); diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 5b07f3f4a2..41dd33c6a7 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -372,6 +372,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); init_revisions(&revs, prefix); revs.abbrev = DEFAULT_ABBREV; + revs.allow_exclude_promisor_objects_opt = 1; revs.commit_format = CMIT_FMT_UNSPECIFIED; /* |