diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-11-11 12:34:41 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-11-11 12:34:41 -0800 |
commit | a7df4f52affe49f6b06246b9398e99e1937f9efc (patch) | |
tree | f39ce03ff26107290c0921726586dba2c1144198 /revision.c | |
parent | revision: avoid hitting packfiles when commits are in commit-graph (diff) | |
download | tgif-a7df4f52affe49f6b06246b9398e99e1937f9efc.tar.xz |
Revert "connected: do not sort input revisions"
This reverts commit f45022dc2fd692fd024f2eb41a86a66f19013d43,
as this is like breakage in the traversal more likely. In a
history with 10 single strand of pearls,
1-->2-->3--...->7-->8-->9-->10
asking "rev-list --unsorted-input 1 10 --not 9 8 7 6 5 4" fails to
paint the bottom 1 uninteresting as the traversal stops, without
completing the propagation of uninteresting bit starting at 4 down
through 3 and 2 to 1.
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/revision.c b/revision.c index 0dabb5a0bc..037b632d1c 100644 --- a/revision.c +++ b/revision.c @@ -2254,10 +2254,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--author-date-order")) { revs->sort_order = REV_SORT_BY_AUTHOR_DATE; revs->topo_order = 1; - } else if (!strcmp(arg, "--unsorted-input")) { - if (revs->no_walk) - die(_("--unsorted-input is incompatible with --no-walk")); - revs->unsorted_input = 1; } else if (!strcmp(arg, "--early-output")) { revs->early_output = 100; revs->topo_order = 1; @@ -2653,13 +2649,8 @@ static int handle_revision_pseudo_opt(const char *submodule, } else if (!strcmp(arg, "--not")) { *flags ^= UNINTERESTING | BOTTOM; } else if (!strcmp(arg, "--no-walk")) { - if (!revs->no_walk && revs->unsorted_input) - die(_("--no-walk is incompatible with --unsorted-input")); revs->no_walk = 1; } else if (skip_prefix(arg, "--no-walk=", &optarg)) { - if (!revs->no_walk && revs->unsorted_input) - die(_("--no-walk is incompatible with --unsorted-input")); - /* * Detached form ("--no-walk X" as opposed to "--no-walk=X") * not allowed, since the argument is optional. |