diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-11-12 23:29:24 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-11-12 23:29:24 (GMT) |
commit | 8996d68ac7052bf96a38a2b36546c4239280279e (patch) | |
tree | e80af241f744029434b6c368ea5bd675d34ef497 /revision.c | |
parent | 4d53e91c6b2c3f5b5c7375e579a453fc5053c08b (diff) | |
parent | a7df4f52affe49f6b06246b9398e99e1937f9efc (diff) | |
download | git-8996d68ac7052bf96a38a2b36546c4239280279e.zip git-8996d68ac7052bf96a38a2b36546c4239280279e.tar.gz git-8996d68ac7052bf96a38a2b36546c4239280279e.tar.bz2 |
Merge branch 'ps/connectivity-optim'
Regression fix.
* ps/connectivity-optim:
Revert "connected: do not sort input revisions"
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -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; @@ -2651,13 +2647,8 @@ static int handle_revision_pseudo_opt(struct rev_info *revs, } 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. |