summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-12 19:38:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-12 19:38:57 (GMT)
commit832258da969fbedbbd1d474900dbdbdf23d4bca1 (patch)
tree5a4e2d2b8d0f3be973f4871bdb85389db2063c74 /revision.c
parente20d5a2c4433daf09797d9e4e9f6c4eaedec86dd (diff)
parent2dacf26d0985521c0f30e535963a45257b63ea21 (diff)
downloadgit-832258da969fbedbbd1d474900dbdbdf23d4bca1.zip
git-832258da969fbedbbd1d474900dbdbdf23d4bca1.tar.gz
git-832258da969fbedbbd1d474900dbdbdf23d4bca1.tar.bz2
Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'
Earlier we made "rev-list --object-edge" more aggressively list the objects at the edge commits, in order to reduce number of objects fetched into a shallow repository, but the change affected cases other than "fetching into a shallow repository" and made it unusably slow (e.g. fetching into a normal repository should not have to suffer the overhead from extra processing). Limit it to a more specific case by introducing --objects-edge-aggressive, a new option to rev-list. * bc/fetch-thin-less-aggressive-in-normal-repository: pack-objects: use --objects-edge-aggressive for shallow repos rev-list: add an option to mark fewer edges as uninteresting Documentation: add missing article in rev-list-options.txt
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 14e0e03..86406a2 100644
--- a/revision.c
+++ b/revision.c
@@ -1853,6 +1853,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->tree_objects = 1;
revs->blob_objects = 1;
revs->edge_hint = 1;
+ } else if (!strcmp(arg, "--objects-edge-aggressive")) {
+ revs->tag_objects = 1;
+ revs->tree_objects = 1;
+ revs->blob_objects = 1;
+ revs->edge_hint = 1;
+ revs->edge_hint_aggressive = 1;
} else if (!strcmp(arg, "--verify-objects")) {
revs->tag_objects = 1;
revs->tree_objects = 1;