diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-06 09:50:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-06 09:50:21 +0300 |
| commit | a29b8bcf624006cf66abe129c01c932ec75df9f7 (patch) | |
| tree | f0b2fe07b7913d36e9151fc995aa3a31e3ffae65 /builtin/prune.c | |
| parent | 8ac6990b8712cb7c44dfc4ff8d9e99b5ec55b01d (diff) | |
| parent | 669b1d2aaec73ba762bf566078308075886ca208 (diff) | |
Merge branch 'md/exclude-promisor-objects-fix'
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/prune.c')
| -rw-r--r-- | builtin/prune.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/prune.c b/builtin/prune.c index 1ec9ddd751..e42653b99c 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; repo_init_revisions(the_repository, &revs, prefix); argc = parse_options(argc, argv, prefix, options, prune_usage, 0); |