diff options
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 ab7c135804..1981a0859f 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; @@ -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. |