Merge branch 'ps/connectivity-optim'

Regression fix.

* ps/connectivity-optim:
  Revert "connected: do not sort input revisions"

4 files changed, 1 insertions, 48 deletions

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index b7bd27e171..24569b06d1 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -968,11 +968,6 @@ list of the missing objects.  Object IDs are prefixed with a ``?'' character.
 	objects.
 endif::git-rev-list[]
 
---unsorted-input::
-	Show commits in the order they were given on the command line instead
-	of sorting them in reverse chronological order by commit time. Cannot
-	be combined with `--no-walk` or `--no-walk=sorted`.
-
 --no-walk[=(sorted|unsorted)]::
 	Only show the given commits, but do not traverse their ancestors.
 	This has no effect if a range is specified. If the argument
@@ -980,8 +975,7 @@ endif::git-rev-list[]
 	given on the command line. Otherwise (if `sorted` or no argument
 	was given), the commits are shown in reverse chronological order
 	by commit time.
-	Cannot be combined with `--graph`. Cannot be combined with
-	`--unsorted-input` if `sorted` or no argument was given.
+	Cannot be combined with `--graph`.
 
 --do-walk::
 	Overrides a previous `--no-walk`.
diff --git a/connected.c b/connected.c
index cf68e37a97..35bd4a2638 100644
--- a/connected.c
+++ b/connected.c
@@ -107,7 +107,6 @@ no_promisor_pack_found:
 	if (opt->progress)
 		strvec_pushf(&rev_list.args, "--progress=%s",
 			     _("Checking connectivity"));
-	strvec_push(&rev_list.args, "--unsorted-input");
 
 	rev_list.git_cmd = 1;
 	rev_list.env = opt->env;
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.
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index ef849e5bc8..12def7bcbf 100755
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -169,35 +169,4 @@ test_expect_success 'rev-list --count --objects' '
 	test_line_count = $count actual
 '
 
-test_expect_success 'rev-list --unsorted-input results in different sorting' '
-	git rev-list --unsorted-input HEAD HEAD~ >first &&
-	git rev-list --unsorted-input HEAD~ HEAD >second &&
-	! test_cmp first second &&
-	sort first >first.sorted &&
-	sort second >second.sorted &&
-	test_cmp first.sorted second.sorted
-'
-
-test_expect_success 'rev-list --unsorted-input incompatible with --no-walk' '
-	cat >expect <<-EOF &&
-		fatal: --no-walk is incompatible with --unsorted-input
-	EOF
-	test_must_fail git rev-list --unsorted-input --no-walk HEAD 2>error &&
-	test_cmp expect error &&
-	test_must_fail git rev-list --unsorted-input --no-walk=sorted HEAD 2>error &&
-	test_cmp expect error &&
-	test_must_fail git rev-list --unsorted-input --no-walk=unsorted HEAD 2>error &&
-	test_cmp expect error &&
-
-	cat >expect <<-EOF &&
-		fatal: --unsorted-input is incompatible with --no-walk
-	EOF
-	test_must_fail git rev-list --no-walk --unsorted-input HEAD 2>error &&
-	test_cmp expect error &&
-	test_must_fail git rev-list --no-walk=sorted --unsorted-input HEAD 2>error &&
-	test_cmp expect error &&
-	test_must_fail git rev-list --no-walk=unsorted --unsorted-input HEAD 2>error &&
-	test_cmp expect error
-'
-
 test_done